Yes you will have to resolve the conflicts, mark them as so with `git add` or `git rm` and `git commit`

The commit is not done yet, after the `git revert` - if you see .git/MERGE_MSG, you will see something like:

&gt; Revert &quot;adding revert&quot;
&gt; 
&gt; This reverts commit
&gt; c1366607f15a8384434948cb0bcbf8ece48bb460.
&gt; 
&gt; Conflicts:
&gt; 
&gt; 	revert

So once you resolved the merge and do a `git commit` you will be presented with the message from the MERGE_MSG file and you can commit and that completes the revert.



You can use **git reset --hard**, if you want to delete all the conflicts and remove the revert you have done for which the abort error arise. 

Why are triangles always used for drawing surfaces in 3D? Why not a square or some other shape?

Why do 3D engines primarily use triangles to draw surfaces?

I can find the current git branch name by doing either of these:

    git branch | awk &#39;/^\*/ { print $2 }&#39;
    git describe --contains --all HEAD

But when in a detached HEAD state, such as in the post build phase in a [Jenkins][1] maven build (or in a Travis git fetch), these commands doesn&#39;t work.

My current working solution is this:

    git show-ref | grep $(git log --pretty=%h -1) | sed &#39;s|.*/$.*$|\1|&#39; | sort -u | grep -v HEAD

It displays any branch name that has the last commit on its HEAD tip.  This works fine, but I feel that someone with stronger git-fu might have a prettier solution?

  [1]: http://jenkins-ci.org/

How to find the current git branch in detached HEAD state

OK, so I&#39;m getting an error sometimes when I try to revert a commit (with Git). All that I do is

`git revert &lt;commit hash&gt;`

and it gives me this message:

    error: could not revert &lt;commit hash&gt; &lt;commit message&gt;
    hint: after resolving the conflicts, mark the corrected paths
    hint: with &#39;git add &lt;paths&gt;&#39; or &#39;git rm &lt;paths&gt;&#39;

Does this mean that I should use `git mergetool` and resolve any conflicts? Once I do this can I add/rm and then commit, and the revert is complete?

What should I do when git revert aborts with an error message?

OK, so I'm getting an error sometimes when I try to revert a commit (with Git). All that I do is
<code>git revert &#x3C;commit hash></code>
and it gives me this message:
<pre><code class="hljs language-sql">error: could not revert &#x3C;commit hash> &#x3C;commit message>
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add &#x3C;paths>' or 'git rm &#x3C;paths>'
</code></pre>
Does this mean that I should use <code>git mergetool</code> and resolve any conflicts? Once I do this can I add/rm and then commit, and the revert is complete?

I create a new branch in Git:

    git branch my_branch

Push it:

    git push origin my_branch

Now say someone made some changes on the server and I want to pull from `origin/my_branch`. I do:

    git pull

But I get:

    You asked me to pull without telling me which branch you
    want to merge with, and &#39;branch.my_branch.merge&#39; in
    your configuration file does not tell me, either. Please
    specify which branch you want to use on the command line and
    try again (e.g. &#39;git pull &lt;repository&gt; &lt;refspec&gt;&#39;).
    See git-pull(1) for details.
    
    If you often merge with the same branch, you may want to
    use something like the following in your configuration file:
    
        [branch &quot;my_branch&quot;]
        remote = &lt;nickname&gt;
        merge = &lt;remote-ref&gt;
    
        [remote &quot;&lt;nickname&gt;&quot;]
        url = &lt;url&gt;
        fetch = &lt;refspec&gt;
    
    See git-config(1) for details.

I learned that I can make it work with:

    git branch --set-upstream my_branch origin/my_branch

But why do I need to do this for every branch I create? Isn&#39;t it obvious that if I push `my_branch` into `origin/my_branch`, then I would want to pull `origin/my_branch` into `my_branch`? How can I make this the default behavior?

Why do I need to do `--set-upstream` all the time?

I&#39;m new with git, so I decided to learn git using the tutorials of github. The third chapter said: 
&gt;&quot;For this first example we’ll modify the README file to add ourselves as an author on the project. So we simply edit the file. Now we want to commit that change, so we run the `git commit -a` command.&quot;

When I use the `git commit -a` command, the console opens a vim and I wrote my message, but I don&#39;t know how to close this vim editor from the console. How do I save the message and close vim?

Using git commit -a with vim

I forked a repository on Github. I&#39;ve made some minor changes and submitted pull requests to the upstream, but along the way my fork has become so mangled I&#39;m unable to generate clean pull requests; when I start a pull request from a branch with six changes, Github wants to submit thirteen, with seven of them already existing upstream (natch). 

My problem seems to be related to [only pulling the latest commits][2], but when I create a new branch and cherry-pick commits I still have extras. I&#39;ve futzed with [rebasing][3] as well, but now it looks like even [my master][4] is so messed up I can&#39;t generate a clean copy of [upstream][5]. This is apparently because I didn&#39;t understand that I needed to [rebase instead of merging][1], so clearly I&#39;ve made mistakes; what I&#39;m trying to do is figure out how to unsnarl that knot and get back to a clean state where I can move forward usefully.

I kind of want to blow away my fork and make a new fork of the upstream, but I gather that, too, is difficult. 

Having confessed my Git sins, how do I obtain github absolution?

  [1]: https://stackoverflow.com/questions/5968964/avoid-unwanted-merge-commits-and-other-commits-when-doing-pull-request-in-github/5969100#5969100
  [2]: https://stackoverflow.com/q/5561161/306084
  [3]: https://stackoverflow.com/q/3867284/306084
  [4]: https://github.com/pjmorse/sproutguides
  [5]: https://github.com/sproutcore/sproutguides

How do I clean up my Github fork so I can make clean pull requests?

I&#39;m building an application which I&#39;m also testing in Heroku. I ran into some problem today and had to rollback one commit in my local git repo, but Heroku now won&#39;t recognize my changes saying that &quot;everything is up to date&quot;.

So, running

    git push heroku master

heroku responds with 

    Everything up-to-date

which isn&#39;t true.

UPDATE: Things I&#39;ve tried

    git push -f heroku master
    git push --force heroku master
    git push heroku +master
    git push --force heroku +master

Did some changes in the source code and then

    git add.
    git commit -a -m &quot;Message&quot; #(Then this commit shows in my git explorer)
    git push heroku master #Everything up-to-date

How to reset Heroku app and re-commit everything?

I use my personal laptop for both work and personal projects and I would like to use my work email address for my commits at work (gitolite) and my personal email address for the rest (github).

I read about the following solutions which are all either global or temporary:

 - `git config --global user.email &quot;bob@example.com&quot;`
 - `git config user.email &quot;bob@example.com&quot;`
 - `git commit --author &quot;Bob &lt;bob@example.com&gt;&quot;`
 - setting one of the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL` or `EMAIL` environment variables

One solution is to run manually a shell function that sets my environment to *work* or *personal*, but I am pretty sure that I will often forget to switch to the correct identity resulting in committing under the wrong identity.

Is there a way of binding a certain repository, project name, etc. to an identity (name, email)? What do people do?


How to tell git to use the correct identity (name and email) for a given project?

What is the difference between git `add`, `push` and `commit`?

Just a little confused coming from SVN, where &quot;update&quot; will &#39;add&#39; stuff, and commit does a &quot;push&quot; and will &#39;add&#39; as well

There are all different functions within git. Hoping for some explanation from your experience.

Git: add vs push vs commit

How can I commit changes without specifying commit message? Why is it required by default?

Git commit with no commit message

how do i revert all my files on my local copy back to a certain commit?


    commit 4a155e5b3b4548f5f8139b5210b9bb477fa549de
    Author: John Doe &lt;Doe.John.10@gmail.com&gt;
    Date:   Thu Jul 21 20:51:38 2011 -0500


This is the commit i&#39;d like to revert back to. any help would be a lifesaver!



git revert back to certain commit

I ran &quot;git status&quot; and listed below are some files that were modified/or under the heading &quot;changes not staged for commit&quot;.
It also listed some untracked files that I want to ignore (I have a &quot;.gitignore&quot; file in these directories).

I want to put the modified files in staging so I can commit them.  When I ran &quot;git add .&quot;, it added the modified files AND the files I want to ignore to staging.

How do I add only the modified files and ignore the untracked files if presented with the git status below.

Also, are my &quot;.gitignore&quot; files working properly?


    $ git status
    # On branch addLocation
    # Changes not staged for commit:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   someProject/path/domain/viewer/LocationDO.java
    #       modified:   someProject/path/service/ld/LdService.java
    #       modified:   someProject/path/service/ld/LdServiceImpl.java
    #       modified:   someProject/path/web/jsf/viewer/LocationFormAction.java
    #       modified:   someProject/war/WEB-INF/classes/message/viewer/viewer.properties
    #       modified:   someProject/war/page/viewer/searchForm.xhtml
    #
    # Untracked files:
    #   (use &quot;git add &lt;file&gt;...&quot; to include in what will be committed)
    #
    #       .metadata/
    #       someProject/build/
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)



git add only modified changes and ignore untracked files

&gt; **Possible Duplicate / a more recent/less clear question** &lt;br/&gt;
&gt; [Branch from a previous commit using Git](http://stackoverflow.com/questions/2816715/branch-from-a-previous-commit-using-git)

&lt;!-- End of automatically inserted text --&gt;

I have a Git branch called `jzbranch` and have an old commit id: `a9c146a09505837ec03b`.

How do I create a new branch, `justin`, from the information listed above?



How do I create a new Git branch from an old commit?

I am trying to learn how to restore or rollback files and projects to a prior state, and don&#39;t understand the difference between `git revert`, `checkout`, and `reset`.  Why are there 3 different commands for seemingly the same purpose, and when should someone choose one over the other?


What&#39;s the difference between Git Revert, Checkout and Reset?

I did a commit and reverted with 

    git revert HEAD^

just git log

    ➜  git:(master) git log
    commit 45a0b1371e4705c4f875141232d7a97351f0ed8b
    Author: Daniel Palacio &lt;danpal@gmail.com&gt;
    Date:   Tue Jan 17 16:32:15 2012 -0800
    
        Production explanation


But if I do git log --all it still show up. I need to remove it from the history as it has sensitive information


    git log --all
    commit 5d44355080500ee6518f157c084f519da47b9391
    Author: Daniel Palacio
    Date:   Tue Jan 17 16:40:48 2012 -0800
    
        This commit has to be reset
    
    commit 45a0b1371e4705c4f875141232d7a97351f0ed8b
    Author: Daniel Palacio 
    Date:   Tue Jan 17 16:32:15 2012 -0800
    
        Production explanation



How do I remove the commit 5d44355080500ee6518f157c084f519da47b9391 from the history too?

How to revert last commit and remove it from history?

I know that Git tracks changes I make to my application, and it holds on to them until I commit the changes, but here&#39;s where I&#39;m hung up:

When I want to revert to a previous commit I use: 

&lt;pre&gt;&lt;code&gt;git reset --hard HEAD&lt;/code&gt;&lt;/pre&gt;

And Git returns:

    HEAD is now at 820f417 micro

How do I then revert the files on my hard drive back to that previous commit?

My next steps were:

    git add .
    git commit -m &quot;revert&quot;

But none of the files have changed on my hard drive...

What am I doing right/wrong?


How do I use &#39;git reset --hard HEAD&#39; to revert to a previous commit?

I had a mistake and commit some changes to git which I should not have committed.
After I made the commit, I pushed my changes. 
I then used the following commands to try and reset my changes.

     git reset --hard head

Now I want to push this &#39;reset&#39; to the remote repository with this command:
   
    git push MyBranch
    
But I am getting this error:

    remote: error: denying non-fast-forward refs/heads/branch (you should pull first)

I tried to use this command without any success: 
 
    git push -f &quot;origin&quot; 

Any idea what I can do?

Can not push changes after using git reset --hard

Steps I performed:

I have two branches branch1 and branch2,

    $git branch --Initial state
    $branch1

    $git checkout branch2
    $git pull origin branch1 --Step1

I resolve the conflicts and did a 

    $git commit -m &quot;Merge resolved&quot;

then 

    $git checkout branch1
    $git merge branch2
    $git push origin branch1

Now I realised that while being at step1, the auto merging removed some code and the change code was pushed. Now I want to go back to my initial state in order to revert any changes. Looking for some immediate help?

Revert a merge after being pushed

I&#39;m trying to integrate WinMerge with Git as I&#39;ve seen others done before on Windows 7 Ultimate.

I&#39;ve followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff.

Created a file called winmerge.sh in the root directory of git: C/Program Files (x86)/Git/ with: WinMergeU is the correct location.
    

    #!/bin/sh
    echo Launching WinMergeU.exe: $1 $2
    &quot;C:/Program Files (x86)/WinMerge/WinMergeU.exe&quot; 
    git /e /u /dl &quot;Base&quot; /dr &quot;Mine&quot; &quot;$1&quot; &quot;$2&quot;

and used the following commands.

    git config --global diff.tool winmerge
    git config --global difftool.winmerge.cmd &quot;winmerge.sh \&quot;$LOCAL\&quot; \&quot;$REMOTE\&quot;&quot;
    git config --global difftool.prompt false

The error shows up as:

    git config option merge.tool set to unknown tool: winmerge


How can I make WinMerge my git mergetool?

The documentation is here: http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html
A handy guide is here: http://ryanflorence.com/git-for-beginners/

However, neither of them explain how to use mergetool&#39;s filemerge.

The guide I read says &quot;*I hit enter and FileMerge pops up and I deal with the conflicts:*&quot; but it doesn&#39;t mention ***how*** to &quot;*deal with the conflicts*&quot;.

When I run:

    git mergetool 

:and then hit return as prompted, and the filemerge window opens showing all the merge conflicts, it only responds to the commands cmd+D and cmd+shift+D (which allow cycling through the conflicts). However, there doesn&#39;t seem to be a mention of how to, for each conflict, choose left/right/neither. The combo-box dropdown does not seem to do anything.

Have already looked at docs, guide, file system menu, and systematically pressed keys on the keyboard looking for a response =)

How to use git mergetool&#39;s filemerge

I just merged a branch into my master in git and I got `Automatic merge failed; fix conflicts and then commit the result.` Now I ran `git mergetool` and vimdiff opened with the image below. I don&#39;t know how to use vimdiff. What does each panel here mean and how should I proceed to fix the merge conflict?

![enter image description here][1]


  [1]: http://i.stack.imgur.com/kxn1g.png

How do I use vimdiff to resolve a git merge conflict?

Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install the latest version available of [Git][1] and [KDiff3][2].

When I make a merge and have conflicts, I run the following command:

    git mergetool

Then I receive the message:
&gt;  The merge tool kdiff3 is not available as &#39;kdiff3&#39;.

I guess it must be by the KDiff3 path.

**Environment**

 - OS: Windows 10
 - Git 2.6.1.windows.1
 - KDiff3 0.9.98 (64 bit)

**Questions:**

 - What do I have to configure in the .gitconfig file for the command `git mergetool` to open the KDiff3 GUI with the versions **LOCAL**, **REMOTE**, **BASE** and **MERGED** of conflicted file?

 - How can I configure it to use it as a diff tool?

  [1]: https://git-scm.com/downloads
  [2]: http://kdiff3.sourceforge.net



Git: How can I configure KDiff3 as a merge tool and diff tool?

Today I was trying to use the `git mergetool` on the Windows command prompt and realized that it was defaulting to use *Vim*, which is cool, but I&#39;d prefer *VS Code*.

How can I have *Visual Studio Code* function as my GUI for handling merge conflicts (or even as a diffing tool) for Git?





Content Type	Original Author	Original Content on Stackoverflow
Question	icnhzabot	View Question on Stackoverflow
Solution 1 - Git	manojlds	View Answer on Stackoverflow
Solution 2 - Git	ARKhan	View Answer on Stackoverflow

What should I do when git revert aborts with an error message?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

How to find the current git branch in detached HEAD state

Why do 3D engines primarily use triangles to draw surfaces?

Attributions