how to abort merge of a specific file using git?

Question

I'm using git.

I have done pull action. and there was a merge conflict.

I want to return a specific file to version before the merge.

How do i do this?

After I have done this I want to pull this file only.

There will be a merge conflict. How do I:

a) take the remote version as conflict resolution?

b) take the local version as the conflict resolution?

score 3 · Accepted Answer · edited May 23 '17 at 12:07

3

You can keep the version you want:

git checkout --ours -- afile
git checkout --theirs -- afile

Make sure to read "Why is the meaning of “ours” and “theirs” reversed with git rebase", because if your merge conflict occurs during a git rebase...
then keeping your local version would be git checkout --theirs -- afile(!).

edited May 23 '17 at 12:07

Community

answered Aug 05 '13 at 09:39

VonC

I want to return a specific file to version before the merge. How do i do this? – Elad Benda Aug 05 '13 at 10:53
@EladBenda `git checkout --ours -- afile` (if this is during a `git merge` or `git pull`, meaning you are still in the conflict resolution step: your `git pull` isn't finished yet: you are still resolving conflict, but, for that file, you want to preserve the local version) – VonC Aug 05 '13 at 11:05

1 Answers1