Take the 2-minute tour ×

when I do git rebase master I get conflict sometimes. And sometimes it becomes very difficult to track down an issue even with error messages. It would be a real help if I could find out which commit git is trying to reapply and is causing conflict.

How can I find out which commit is causing the conflict?

share|improve this question
add comment

1 Answer

Look in the conflicting file(s), the lines starting with >>>>>>> show the commit hash which caused the conflict.

share|improve this answer
I don't think you will find any SHA1 in a rebase conflict file (in a merge conflict file, yes, not in a rebase one) –  VonC May 1 '10 at 20:27
add comment

Your Answer


