Restart/undo conflict resolution in a single file

How do I undo a merge conflict resolution?

In case you've made a mistake while resolving a conflict and realize this only after completing the merge, you can still easily undo it: just roll back to the commit before the merge happened with "git reset --hard " and start over again.

Found the solution here: http://gitster.livejournal.com/43665.html

git checkout -m FILE

This restores the unresolved state, including all information about parent and merge base, which allows restarting the resolution.

Related questions

Rebasing a Git merge commit

What's the difference between tag and release?

How to set up a git project to use an external repo submodule?

How to pull specific directory with git

Git commit in terminal opens VIM, but can't get back to terminal

How to keep the local file or the remote file during merge using Git and the command line?

Change branch base

How do I force git pull to overwrite everything on every pull?

Is there a better way to find out if a local git branch exists?

Checkout old commit and make it a new commit [duplicate]

git - skipping specific commits when merging

Create patch or diff file from git repository and apply it to another different git repository

How can I check in a Bash script if my local Git repository has changes?

How to complete a git clone for a big project on an unstable connection?

git --git-dir not working as expected

How do I get the latest version of my code?

What is `git diff --patience` for?

git ignore all files of a certain type, except those in a specific subfolder

Git: copy all files in a directory from another branch

Restore file from old commit in git

Restart/undo conflict resolution in a single file

Tags:

git

git-merge

People also ask

Recent Activity

Donate For Us