You can reset your branch to the state it was in just before the merge if you find the commit it was on then.

One way is to use `git reflog`, it will list all the HEADs you&#39;ve had.
I find that `git reflog --relative-date` is very useful as it shows how long ago each change happened.

Once you find that commit just do a `git reset --hard &lt;commit id&gt;` and your branch will be as it was before.

If you have **SourceTree**, you can look up the `&lt;commit id&gt;` there if `git reflog` is too overwhelming.

If you haven&#39;t committed the merge, then use: 

```git merge --abort
```

If the merge has been accepted accidentally by `git merge --continue` or if the changes are auto committed when `git pull &lt;branch&gt;`, then we can revert or undo the very recent merge by executing 
```
git reset --merge HEAD~1
```

&gt; This command reverts our repository to the last commit. HEAD refers to the current state of your repository; HEAD~1 is the last commit in your repository.



`git revert -m` allows to un-merge still keeping the history of both merge and un-do operation. Might be good for documenting probably.

How do you convert a float to a string in C++ while specifying the precision &amp; number of decimal digits? 

For example: `3.14159265359 -&gt; &quot;3.14&quot;`

Convert float to string with precision &amp; number of decimal digits specified?

On submission of a form, I&#39;m trying to `doSomething()` instead of the default post behaviour. 

Apparently in React, [onSubmit is a supported event for forms.][1] However, when I try the following code:

    var OnSubmitTest = React.createClass({
        render: function() {
            doSomething = function(){
               alert(&#39;it works!&#39;);
            }
        
            return &lt;form onSubmit={doSomething}&gt;
            &lt;button&gt;Click me&lt;/button&gt;
            &lt;/form&gt;;
        }
    });

The method `doSomething()` is run, but thereafter, the default post behaviour is still carried out. 

You can test this in my [jsfiddle][2].

My question: How do I prevent the default post behaviour?


  [1]: http://facebook.github.io/react/docs/events.html#form-events
  [2]: https://jsfiddle.net/ayda5w9m/

Setting onSubmit in React.js

I accidentally did a `git pull origin master` from dev, and master got merged into dev.
Is it possible to unmerge?

I&#39;ve already seen different solutions, i tried this one from both dev and master :
 `git revert -m 1 &lt;commit&gt;` (once each)
But i got : Everything is up-to-date, each time


How to unmerge a Git merge?

<p>I accidentally did a <code>git pull origin master</code> from dev, and master got merged into dev.
Is it possible to unmerge?</p>
<p>I've already seen different solutions, i tried this one from both dev and master :
<code>git revert -m 1 &#x3C;commit></code> (once each)
But i got : Everything is up-to-date, each time</p>


I have a project under Git version control that I worked on both a server and my local computer. I originally had the remote origin set as my local computer but I would now like to change that to BitBucket.

On the server I used the command

    git remote set-url origin bitbucket_address

But now when I try to push my project I get the error

     ! [remote rejected] master -&gt; master (shallow update not allowed)

What is causing this and how do I fix it?

Remote rejected (shallow update not allowed) after changing Git remote URL

**How can I get rid of all the changes in all the files of my repository?**

Say I am in a branch and I did some changes. `git status` returns a set of files in the &quot;Changes not staged for commit&quot; and I notice I would like to get rid of all of these changes in all the files. How can I do this with a single command?

I know I can do the following to checkout just one file:

    git checkout -- &lt;file&gt;

I noticed that `git checkout --` alone returns the list of all uncommited files. However, I cannot find a way to checkout all of them, something like `git checkout --all`.

I checked `man git checkout` and could not find anything. Also I saw https://stackoverflow.com/q/20008025/1983854 and tried `git checkout .` and did not work either.

Would I have to do it programmatically, by looping through the `git checkout --` output?

git checkout all the files

I am building a workflow with **Gitlab**, **Jenkins** and - probably - **Nexus** (I need an artifact storage). I would like to have GitLab to store **releases/binaries** - is it possible in a convenient way?

I would not like to have another service from which a release (and documentation) could be downloaded but to have it somehow integrated with repository manager, just like releases are handled in e.g. GitHub. Any clues?

How to store releases/binaries in GitLab?

I&#39;m trying to install YouCompleteMe from [here](http://christopherpoole.github.io/setting-up-vim-with-YouCompleteMe/).
 
When I execute:

```sh
./install.sh --clang-completer
```

I get this error: 

```sh
env: bash\r: No such file or directory
```

I don&#39;t know what&#39;s wrong with environment variables. Here&#39;s my bash path:

```sh
which bash 
/bin/bash
```

Do I need to change it to `/usr/bash`? If yes, then how should I do that? I tried changing `~/.bashrc` file, but it didn&#39;t work. 


env: bash\r: No such file or directory

In my GitLab repository, I have a group with 20 projects. I want to clone all projects at once. Is that possible?

How to clone all projects of a group at once in GitLab?

I&#39;m trying to filter all my issues on github like this:

    label:bug OR label:enhancement
But obviously that does not work. I found this page
https://help.github.com/articles/searching-issues/
and i thought it must be written there, but I cannot figure out how to do it. 

Could it really be that one cannot filter issues of two labels? I mean that would be such a basic task, wouldn&#39;t it?

Well if anyone could give me a hint upon that matter I&#39;d be glad to hear it.

Can I search github labels with logical operator OR?

I am reading some [docs][1] that discuss how to authenticate on GitHub for a particular repo. They say &quot;You&#39;ll likely want to use a bot account for this.&quot; (Docs are written by a Github employee). What is a bot account? How do I get one?


  [1]: https://github.com/benbalter/change_agent

What is a &quot;bot account&quot; on github?

I&#39;ve noticed that some organizations on GitHub have different labels that they can apply to issues.

For example, one organization that I am a part of allows any of these labels to be applied:

![many labels][1]


However, on my personal account, I am limited to only these labels, and I can&#39;t find a way to create my own custom ones:

![my labels][2]

Any ideas on how I can go about creating my own?


  [1]: http://i.stack.imgur.com/tOw7x.png
  [2]: http://i.stack.imgur.com/FDoJo.png

How to create custom labels for issues on GitHub?

I have a project hosted on GitHub. I fail when trying to push my modifications on the master. I always get the following error message

    Password for &#39;https://git@github.com&#39;: 
    remote: Invalid username or password.
    fatal: Authentication failed for &#39;https://git@github.com/eurydyce/MDANSE.git/&#39;

However, setting my ssh key to github seems ok. Indeed, when I do a `ssh -T git@github.com` I get

    Hi eurydyce! You&#39;ve successfully authenticated, but GitHub does not provide shell access.

Which seems to indicate that everything is OK from that side (eurydyce being my github username). I strictly followed the instructions given on github and the recommendations of many stack discussion but no way. Would you have any idea of what I may have done wrong?

GitHub: invalid username or password

I would like to &quot;unfork&quot; a GitHub fork without deleting + recreating it. Is this possible?

My reason is that my project now has a completely different use to the source of the fork, and makes no sense to be showing number of commits ahead, or the pull request button (or at least, with such prominence). With hindsight, I think I would have just `git clone`d the original, rather than made a fork.

I would like to not delete my fork in order to keep the issues + history of pull requests made.

I am happy to keep the history of commits, it&#39;s just the removal of the fork status that I&#39;m after.

Unfork a Github fork without deleting

I have a repository and some local changes to commit.
Before committing, I pulled the changes onto my local using Egit in Eclipse.

It creates a merge commit and I submit my commit over it.

Now when I am trying to push to origin, it is showing that it will push my commit as well as merge commit.
But ideally, merge commit should not be a part of remote repository.

How to avoid this?


How to avoid merge commits from Git pull when pushing to remote

I am working on a feature branch.

 1. Made several commits. Squashed commits.
 2. Pushed changes to remote branch. Got conflicts.
 3. Merged changes from master, resolved conflicts on feature branch.
    * `git fetch origin master`
    * `git merge FETCH_HEAD`
    * Resolved conflicts manually.
    * `git commit`
    * `git push`
 4. I made one more commit.

So, current commit history looks like this.
From current to old:

 1. commit 3
 2. commit M yyy (Merged) 
 3. commit 2

How do I squash above 3 commits into 1 before I merge my feature branch to master?

How to squash commits which have merge-commit in between?

Following code is taken from [numpy function base on github][1] 

    sa = sort(a[i:i+block])
    n += np.r_[sa.searchsorted(bins[:-1], &#39;left&#39;),
               sa.searchsorted(bins[-1], &#39;right&#39;)]

So I know that searchsorted finds the position in the array `sa` where the elements of `bins` would have to be inserted in order to keep `sa` sorted (`left` gives the index left of where we would insert the value and `right` the right index).
What I don&#39;t understand is the whole construction around it meaning what is

    np.r_[array,array]

What is `np.r_`?

  [1]: https://github.com/numpy/numpy/blob/a79d9d35c1b1582e5e0b8487f5dd414d15944f2c/numpy/lib/function_base.py#L207

What does np.r_ do (numpy)?

I have read relevant questions about git merge and git rebase on SO, but I still cannot fully understand what is happening under the hood.

Here is our branching situation:

    MASTER------------------------
            \        \
             \        \----Feature B---
              \                        \
               \-----Feature A----------\---Feature A+B

Given 2 feature branches that stem from master at different times, we now want to combine the 2 branches. We want to follow the `first rebase then merge` practice, but when we rebase Feature A onto Feature B, we get conflicts. That&#39;s expected, because both features (and master) have changes in the same areas. But the strange thing is that the same conflict keeps reappearing after `git rebase --continue`. This drives us crazy, so we end up aborting the rebase, and use `git merge`. It turns out the conflicts are actually easy to resolve.

My question is two-fold:

 1. Is `git rebase` suitable for our situation? Or is rebase only good for pulling in a few (e.g., 1 or 2) changes?
 2. What is happening under the hood that causes the same conflict to reappear again and again? My understanding is `rebase` resolves conflicts one at a time, but which commit does it compare, and what does it compare it to?

Relavant posts on SO:

 - https://stackoverflow.com/questions/13825079/git-rebase-why-i-have-to-resolve-the-same-conflict-over-and-over
 - https://stackoverflow.com/questions/7241678/how-to-prevent-lot-of-git-conflicts-when-git-rebasing-lot-of-commits\
 - https://stackoverflow.com/questions/3516899/git-rebase-resolve-conflicts-again-and-again


Why does the same conflict reappear when I use git rebase?

I have two separate dataframes that share a project number. In `type_df`, the project number is the index. In `time_df`, the project number is a column. I would like to count the number of rows in `type_df` that have a `Project Type` of `2`. I am trying to do this with `pandas.merge()`. It works great when using both columns, but not indices. I&#39;m not sure how to reference the index and if `merge` is even the right way to do this.

    import pandas as pd
    type_df = pd.DataFrame(data = [[&#39;Type 1&#39;], [&#39;Type 2&#39;]], 
                           columns=[&#39;Project Type&#39;], 
                           index=[&#39;Project2&#39;, &#39;Project1&#39;])
    time_df = pd.DataFrame(data = [[&#39;Project1&#39;, 13], [&#39;Project1&#39;, 12], 
                                   [&#39;Project2&#39;, 41]], 
                           columns=[&#39;Project&#39;, &#39;Time&#39;])
    merged = pd.merge(time_df,type_df, on=[index,&#39;Project&#39;])
    print merged[merged[&#39;Project Type&#39;] == &#39;Type 2&#39;][&#39;Project Type&#39;].count()

Error:
    
&gt; Name &#39;Index&#39; is not defined.

Desired Output:

    2

Using Merge on a column and Index in Pandas

I know how to solve this:

    user@host$ git pull
    Updating 9386059..6e3ffde
    error: Your local changes to the following files would be overwritten by merge:
    	foo.bar
    Please, commit your changes or stash them before you can merge.
    Aborting

But isn&#39;t there a way to let `git pull` do the `stash` and `pop` dance for me?

If this command has a different name, it&#39;s ok.

Creating a shell alias for `git stash; git pull; git stash pop` is a solution, but I search for a better solution.


Can &quot;git pull&quot; automatically stash and pop pending changes?

I&#39;ve been using github from a relatively short period, and I&#39;ve always used the client to perform commits and pulls. I decided to try it from the git bash yesterday, and I successfully created a new repo and committed files.

Today I did changes to the repository from another computer, I&#39;ve committed the changes and now I&#39;m back home and performed a `git pull` to update my local version and I get this:

    There is no tracking information for the current branch.
        Please specify which branch you want to merge with.
        See git-pull(1) for details
    
        git pull &lt;remote&gt; &lt;branch&gt;
    
    If you wish to set tracking information for this branch you can do so with:
    
        git branch --set-upstream develop origin/&lt;branch&gt;

the only contributor to this repo is me and there are no branches (just a master). I&#39;m on windows and I&#39;ve performed the pull from git bash:

[![enter image description here][1]][1]

git status:

    $ git status
    # On branch master
    nothing to commit, working directory clean

git branch:

    $ git branch
    * master

What am I doing wrong?

 


  [1]: https://i.stack.imgur.com/AeyH8.png

There is no tracking information for the current branch

I pull from **my branch**:

    git checkout mybranchSample
    git fetch
    git pull origin master

Then, Git gives me the following message:

&gt; Please enter a commit message to explain why this merge is necessary,  
especially if it merges an updated upstream into a topic branch

[![enter image description here][1]][1]

And after entering a commit message, it merges `master` into my files. And even though I haven&#39;t worked on some files from `master`, it shows the files list in green when I type `git status`.

This issue is **not** happening with my colleagues, but me only.
What can be the reason behind this?


  [1]: https://i.stack.imgur.com/Rbq26.png

Git pull asks me to write merge message

I am trying to do a `git pull origin master` from my server but keep getting the error:

`Please move or remove them before you can merge.`

There are no untracked files, but it seems like it has issues with the *ignored files* for some reason.

I tried running a `git clean -nd` to see what would be deleted and it lists a whole bunch of files that are ignored in `.gitignore`.

How can I fix this so I can do a pull?

Git pull - Please move or remove them before you can merge

I am having difficulty in doing a pull from `origin`. I keep getting:

&gt; &quot;Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.&quot;

This also applies to switching branches. I get a similar sort of message, but this does not always happen.

I am using Visual Studio 2015 Update 1 and Visual Studio Team Services Git. On my machine I have a local `master` branch, and development branches. Every time I switch to `master` and then I do a pull I get the error message. I have resorted to doing a stash and drop stash (command line) and sometimes I use [TortoiseGit][1] to do the pull and it works.

What is strange is even if I try to revert (on the uncommitted files) using TortoiseGit it shows that it was reverted successfully (I have already tried Visual Studio undo, nothing happens). Trying to pull again, it is still the same problem. The uncommitted files will be there and sometimes when I do a `git status` it says there is nothing to commit.

Just a note: This can happen even after switching from a branch onto `master`. In this case there is no way there can be uncommitted changes, because I would not have been able to switch in the first place.

I am still new to Git, but I would like to know if there is a better way of solving this as I would like to use one environment instead of using switching between different environments for each task; it&#39;s easier for me to just do everything from Visual Studio. I have already read up on:

*https://stackoverflow.com/questions/26885057/tfs-git-in-vs-cannot-switch-to-master-because-there-are-uncommitted-changes*

**UPDATE**

It seems like this problem has to do with line endings.

By doing a `git diff -R` you can see that a line ending has been added, &quot;^M&quot;, and it is different. Removing the `* text=auto` in gitattributes (then check for changes) and putting it back on again so that the gitattributes does not signal a change of itself that needs to be committed seems to help, there will not be any changes.

  [1]: http://en.wikipedia.org/wiki/TortoiseGit


Content Type	Original Author	Original Content on Stackoverflow
Question	redAce	View Question on Stackoverflow
Solution 1 - Git	Andreas Wederbrand	View Answer on Stackoverflow
Solution 2 - Git	Porcupine	View Answer on Stackoverflow
Solution 3 - Git	Prasanth Rajendran	View Answer on Stackoverflow
Solution 4 - Git	poige	View Answer on Stackoverflow

How to unmerge a Git merge?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Setting onSubmit in React.js

Convert float to string with precision & number of decimal digits specified?

Attributions