Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git

by

The solution is very simple. git checkout <filename> tries to check out file from the index, and therefore fails on merge.

What you need to do is (i.e. checkout a commit):

To checkout your own version you can use one of:

git checkout HEAD -- <filename>

or

git checkout --ours -- <filename>

(Warning!: If you are rebasing --ours and --theirs are swapped.)

or

git show :2:<filename> > <filename> # (stage 2 is ours)

To checkout the other version you can use one of:

git checkout test-branch -- <filename>

or

git checkout --theirs -- <filename>

or

git show :3:<filename> > <filename> # (stage 3 is theirs)

You would also need to run ‘add’ to mark it as resolved:

git add <filename>

More Related Contents:

  1. How to replace master branch in Git, entirely, from another branch? [duplicate]
  2. What is the difference between merge –squash and rebase?
  3. What effect does the `–no-ff` flag have for `git merge`?
  4. Git – how to force merge conflict and manual merge on selected file
  5. Is it possible for git-merge to ignore line-ending differences?
  6. Merging: Hg/Git vs. SVN
  7. What is the precise meaning of “ours” and “theirs” in git?
  8. git cherry-pick says “…38c74d is a merge but no -m option was given”
  9. Git: ignore some files during a merge (keep some files restricted to one branch)
  10. Moving Git repository content to another repository preserving history
  11. Git merge reports “Already up-to-date” though there is a difference
  12. Git – Ignore files during merge
  13. Rebasing a Git merge commit
  14. Prevent commits in master branch
  15. How does ‘git merge’ work in details?
  16. Pull a certain branch from the remote server
  17. How to “git show” a merge commit with combined diff output even when every changed file agrees with one of the parents?
  18. Disable Git Rename Detection
  19. git partial merge, not whole branch
  20. How to identify conflicting commits by hash during git rebase?
  21. What Git branching models work for you?
  22. How can I get the parents of a merge commit in Git?
  23. How to merge two branches without a common ancestor?
  24. Git – how to force manual merge even if there is no conflict
  25. Reverting a git merge while allowing for the same merge later)
  26. git: merge two branches: what direction?
  27. Git: How to create patches for a merge?
  28. Git merge squash repeatedly
  29. git merging branches in a bare repository
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment