so basically I:  Made a Github repository and cloned it to my desktop Modified the README.md file from Github and forgot to pull it to my desktop Made over 10 commits from like 2 hours of code  Git won't let me push: ![rejected] error: failed to push some refs  Git won't let me pull: Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.  What can I do?
I want to resolve merge conflicts in my Git repository. How to do that ?
Recently I've installed Kubuntu in a newly bought laptop with an Intel WiFi 6 AX200 network card, I can connect to the wifi without apparent problems but when I open the driver manager in the settings I face this weird situation:  Intel Corporation: Wi-Fi 6 AX200 This device is not working.  [ ] Using iwlwifi driver backport in DKMS format from backport-iwlwifi-dkms (open source)  [ ] Continue using a manually installed driver  [x] Do not use the device   Note that "Continue using a manually installed driver" is the only voice selectable in the list.  Here is some additional information:  $ lspci -nnk | grep 0280 -A3 02:00.0 Network controller [0280]: Intel Corporation Wi-Fi 6 AX200 [8086:2723] (rev 1a)         Subsystem: Intel Corporation Wi-Fi 6 AX200 [8086:0084]         Kernel driver in use: iwlwifi         Kernel modules: iwlwifi  $ rfkill list all 0: hci0: Bluetooth         Soft blocked: yes         Hard blocked: no 1: phy0: Wireless LAN         Soft blocked: no         Hard blocked: no  $ dmesg | grep iwl [    2.888227] iwlwifi 0000:02:00.0: enabling device (0000 -&gt; 0002) [    2.945179] iwlwifi 0000:02:00.0: Direct firmware load for iwlwifi-cc-a0-50.ucode failed with error -2 [    2.945217] iwlwifi 0000:02:00.0: Direct firmware load for iwlwifi-cc-a0-49.ucode failed with error -2 [    2.947244] iwlwifi 0000:02:00.0: TLV_FW_FSEQ_VERSION: FSEQ Version: 43.2.23.17 [    2.947250] iwlwifi 0000:02:00.0: Found debug destination: EXTERNAL_DRAM [    2.947252] iwlwifi 0000:02:00.0: Found debug configuration: 0 [    2.947697] iwlwifi 0000:02:00.0: loaded firmware version 48.4fa0041f.0 op_mode iwlmvm [    3.145585] iwlwifi 0000:02:00.0: Detected Intel(R) Wi-Fi 6 AX200 160MHz, REV=0x340 [    3.159226] iwlwifi 0000:02:00.0: Applying debug destination EXTERNAL_DRAM [    3.160060] iwlwifi 0000:02:00.0: Allocated 0x00400000 bytes for firmware monitor. [    3.336456] iwlwifi 0000:02:00.0: base HW address: 50:eb:71:d7:0b:40 [    3.353553] iwlwifi 0000:02:00.0 wlp2s0: renamed from wlan0 [    4.457920] iwlwifi 0000:02:00.0: Applying debug destination EXTERNAL_DRAM [    4.621843] iwlwifi 0000:02:00.0: FW already configured (0) - re-configuring [    4.629999] iwlwifi 0000:02:00.0: BIOS contains WGDS but no WRDS   Someone have idea why this happened? How to install apps which require a newer version of iOS on a 1st gen. iPad? Does order matter when casting a cantrip with a casting time of a bonus action and another spell? When casting a spell as a bonus action, you can't cast another spell on the same turn except a 1-action cantrip - can the order be "reversed"? Can you cast a cantrip first as a bonus action, then any other spell? If not, would it be broken to allow it?  I'm thinking a Sorcerer casting a Quickened true strike, then casting a leveled spell requiring a touch attack. Seems like a great use of the cantrip + Metamagic feature, but it seems like it is not allowed. How do you compute the earth's radius at a given geodetic latitude? How can I fade tabs in & out with the Twitter Bootstrap framework? Why does kinetic energy increase quadratically, not linearly, with speed? As  says:     [...] the kinetic energy of a non-rotating object of mass $m$ traveling at a speed $v$ is $\frac{1}{2}mv^2$.   Why does this not increase linearly with speed? Why does it take so much more energy to go from $1\ \mathrm{m/s}$ to $2\ \mathrm{m/s}$ than it does to go from $0\ \mathrm{m/s}$ to $1\ \mathrm{m/s}$?  My intuition is wrong here, please help it out! What does the notation $\Gamma \vDash \phi$ mean (in Mathematical Logic)? What does the notation $\Gamma \vDash \phi$ mean (in Mathematical Logic)?  I understand that $\Gamma$ represents a system of formulas, and that $\phi$ represents an individual formula.  I also know that $\Gamma \vDash \phi$ means " $\phi$ is a semantic consequence of $\Gamma$" - but I do not understand what this actually means. Can someone explain this idea to me in layman's terms?  Furthermore, suppose I had the following question:     Let $\Gamma \cup \{ \phi \}$. Does $\Gamma \vDash \phi$ hold for the set of formulae   $$ \Gamma = \{ p \rightarrow q, q \rightarrow r, r \rightarrow s \} \hspace{10 mm} \text{ where } \phi \text{ is } p \rightarrow s $$   Would I attempt this question by trying to prove that, for every formula $\psi \in \Gamma$, the valuation $v(\psi) = T$, based on the assumption that $v(\phi) = T$? Evaluating this integral : $ \int \frac {1-7\cos^2x} {\sin^7x \cos^2x} dx $ The question :  $$ \int \frac {1-7\cos^2x} {\sin^7x \cos^2x} dx $$  I tried dividing by $\cos^2 x$ and splitting the fraction.  That turned out to be complicated(Atleast for me!)  How do I proceed now? My question is, if you create a new domain user account for each of the SQL Server processes, what permissions should be set for each account? Or does the SQL configuration manager actually take care of this, and I just had an unforeseen issue?  I quite often have to setup Microsoft SQL Server and wondered if anyone can provide advice on configuring the accounts the services should run as. IMO this has been vaguely documented by Microsoft, while they point you in the right direction I have never been able to find any concrete examples.  To summarize what I've seen so far:  For simple deployments\development environments it is OK to use the virtual account defaults the installer uses: e.g. NT SERVICE\MSSQLSERVER  Avoid using the SYSTEM account, this is not secure.  For production and in domain environments it's recommended to use either a Managed Service Account, or create a domain user account (not an admin) for each service. Allegedly if you use a domain account at installation time the installer will set any required permissions for you.  If changing the service account on an existing install from a virtual account to a domain account the recommendation is to use the SQL Server configuration manager to set the new service accounts. Allegedly this will set any required permissions for you.  I just tried changing the service account in an existing install to a domain account and it would give me a logon failure until I granted the account log on as service permission, which contradicts the part where the SQL Server configuration manager will set any required permissions. (Although I'm not sure if a GPO may have interfered with setting this local security policy)  Microsoft does provide a list of the permissions that the SQL Server Setup grants .  But it's not clear to me if that is something I should be doing manually for the user I create to run the service as, or whether using the SQL config manager should automatically set these permissions.  SQL Server 2014, Domain Controller is on Windows Server 2008 R2. Why does a find field value in one application show up in a the find field of another application? On my MacBook Pro I have found that several applications seem to share the value for a find.  For example, I searched 'applestackexchange' in Safari's unified address bar, then I switch to Xcode and click into a Find field.  The first word of my search in Safari then appears there.  iTerm2 and Sublime Text 2 also seem to participate in this sharing.  Running latest Mountain Lion on  a 2012 MBP. Rules of thumb for divisibility Given a number presented in decimal form $n=\sum_{k=0} d_k10^k$ there are some nice thumb rules to decide whether it is divisible with a prime number  $p\in\{7,11,13,17,19,23,29\}$.   For each of this numbers there is a number  $a_p$ such that $p|n\iff p|(a_p\cdot d_0+\sum_{k=0} d_{k+1}10^k)$.  $a_7=-2,\;a_{11}=-1,\;a_{13}=4,\;a_{17}=-5,\;a_{19}=2,\;a_{23}=7,\;a_{29}=3$  E.g. $\;19\cdot 17=323$ and $32+2\cdot 3=38=2\cdot 19$ and $32-5\cdot 3=17$.  Is there a number $a_{31}$ that works the same way? Or $a_p,\;p\ge37$? Is it worth encrypting email addresses in the database? Constants of motion vs. integrals of motion vs. first integrals Since the equation of mechanics are of second order in time, we know that for $N$ degrees of freedom we have to specify $2N$ initial conditions. One of them is the initial time $t_0$ and the rest of them, $2N-1$ are initial positions and velocity. Any function of these initial condition is a constant of motion, by definition. Also, there should be exactly $2N-1$ algebraically independent constants of motion.  On the other hand, Noether's procedure gives us integrals of motion as a result of variational symmetries of the action. These integrals of motion are also conserved but they are not always $2N-1$ in number. In consequence, we classify the system by their integrability.  So, what is the difference between the  and ? Why do non- have less integrals of motion when they should always have $2N-1$ constants of motion? R's randomForest can not handle more than 32 levels. What is workaround? R's randomForest package can not handle factor with more than 32 levels. When it is given more than 32 levels, it emits an error message:     Can not handle categorical predictors with more than 32 categories.   But the data I have has several factors. Some of them have 1000+ levels and some of them have 100+. It even has 'state' of united states which is 52.   So, here's my question.   Why is there such limitation? randomForest refuse to run even for the simple case.  &gt; d &lt;- data.frame(x=factor(1:50), y=1:50) &gt; randomForest(y ~ x, data=d)   Error in randomForest.default(m, y, ...) :    Can not handle categorical predictors with more than 32 categories.   If it is simply due to memory limitation, how can scikit learn's randomForeestRegressor run with more than 32 levels? What is the best way to handle this problem? Suppose that I have X1, X2, ..., X50 independent variables and Y is dependent variable. And suppose that X1, X2 and X3 has more than 32 levels. What should I do?  What I'm thinking of is running clustering algorithm for each of X1, X2 and X3 where distance is defined as difference in Y. I'll run three clusterings as there are three problematic variables. And in each clustering, I wish I can find similar levels. And I'll merge them.  How does this sound? Appendix without letter in TOC Do I need to change my ESTA address when visiting the US? I have an ESTA for my visit last Sept to NY and I know it is valid for 2years.  I am going to Las Vegas in May, do I have to update the address at which I will be staying? Solving equation involving Euler's totient function Given $m\in\mathbb{N}$, is there a general way to solve the equation \begin{equation} \varphi(n)=m \end{equation} where $\varphi$ is the Euler's totient function? For example, I want to solve for all the $n$'s such that $\varphi(n)=4$. Is there any way to solve it that are also applicable to many (if not general) cases? Alka Seltzer Model: formulas/models requested This evening I became fascinated with how my Alka Seltzer tablet disintegrates over time within a small portion of Diet Lipton Citrus Ice Tea. I used a nearly frozen cup; tall, as one might request in a middle-class restaurant.  It is interesting to notice that the Alka Seltzer tablet attempts to float to the top of the glass; but it just cant quite make it, e.g., it keeps bobbing up and down and finally it becomes complete residue.  What are the formulas for this, completely? What might the mathematical model look like from start to finish? My first identifications include, but certainly not limited to: measuring the cup, the milligrams deposited into the cup and of course a the makings of a typical tablet of Alka Seltzer excluding room temperature? Signature/date line with fixed width How to delete file(s) in secure manner? Is there a way to make sure that a deleted file can not be recovered?   As you know, deleting a file by pressing shift-del or using trash doesn't mean that file is gone forever. It resides somewhere in the computer.  In day to day life, law enforcement or thieves use recovery programs to reveal our private data or something else.   They can recover all data that resides on hard disk, in RAM, and even USB.  To protect us from these people, what should one do? Which program should one use?  Note: I don't want an answer like first use a recovery program then erase that file with shred. With just one program, I want to erase all unused/deleted files on my computer.