How to identify conflicting commits by hash during git rebase?

by

Short Answer

If it says 

Patch failed at 0001 commit message for F

Then run

$ head -1 .git/rebase-apply/0001
From ad1c7739c1152502229e3f2ab759ec5323988326 Mon Sep 17 00:00:00 2001

To get the SHA ad1c77 of the failing commit, and then use git show ad1c77 to have a look at it.

Long Answer

Let’s start with this tree:

A---B---C---D
     \
      E---F---G

$ git checkout G
$ git rebase D

When a rebase conflict occurs, it is a conflict between

  • the upstream changes (C--D) from the the common ancestor (B) PLUS the already rebased changes and already resolved conflict (E') versus
  • the patch of the next commit (F)

Let’s see what happens:

1) A---B---C---D---E'          <- E patched and committed successfully as E'
2) A---B---C---D---E'---       <- failed to patch F onto E'

Here’s the error message:

First, rewinding head to replay your work on top of it...
Applying: commit message for F
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging 1.txt
CONFLICT (content): Merge conflict in 1.txt
Failed to merge in the changes.
Patch failed at 0001 commit message for F

First, you can see that it was F, because the commit message appears. However, if your commit messages all look like “foo”, “documentation” or “some fixes”, then this won’t help, and you really want the SHA id ad1c77 or the contents of the patch.

Here’s how to find out the real identity of F:

When it lists the rebase conflict, it will say something like:

Patch failed at 0001 commit message for F

Now look in .git/rebase-apply/, where you will find the patch file 0001:

$ ls .git/rebase-apply
0001          head-name     msg           orig-head     sign
0002          info          msg-clean     patch         threeway
apply-opt     keep          next          quiet         utf8
final-commit  last          onto          rebasing

The patch file includes the original commit-id

$ head -1 .git/rebase-apply/0001
From ad1c7739c1152502229e3f2ab759ec5323988326 Mon Sep 17 00:00:00 2001

You can then look at that.

There must be an easier way, but this works.

Note that the fact that the patch failed may be due to a different commit (if you are rebasing onto a common ancestor of HEAD and the rebase target). Finding that commit is rather more complicated, although you could try doing the rebase in reverse to find it:

$ git checkout D
$ git rebase G

More Related Contents:

  1. What is the difference between merge –squash and rebase?
  2. What’s the difference between ‘git merge’ and ‘git rebase’?
  3. Rebasing a Git merge commit
  4. How to squash all git commits into one?
  5. Git – how to force merge conflict and manual merge on selected file
  6. How to inject a commit between some two arbitrary commits in the past?
  7. Git: ignore some files during a merge (keep some files restricted to one branch)
  8. Moving Git repository content to another repository preserving history
  9. Git merge reports “Already up-to-date” though there is a difference
  10. Squash the first two commits in Git? [duplicate]
  11. Prevent commits in master branch
  12. How does ‘git merge’ work in details?
  13. How to “git show” a merge commit with combined diff output even when every changed file agrees with one of the parents?
  14. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  15. Git rebase fails, ‘Your local changes to the following files would be overwritten by merge’. No local changes?
  16. How to merge two branches without a common ancestor?
  17. Git – how to force manual merge even if there is no conflict
  18. How do I squash two non-consecutive commits?
  19. How do I select a merge strategy for a git rebase?
  20. How do I git rebase the first commit?
  21. Git interactive rebase without opening the editor
  22. git rebase: “error: cannot stat ‘file’: Permission denied”
  23. Git: How to rebase to a specific commit?
  24. git rebase merge conflict
  25. git: merge two branches: what direction?
  26. Git rebase branch with all parent branches (or dependent sub-branches)
  27. What does “Auto packing the repository for optimum performance” mean?
  28. How do I make git merge’s default be –no-ff –no-commit?
  29. How to perform a three-way diff in Git without merging?
  30. How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

Leave a Comment