5

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?

Nick Vanderbilt
  • 36,724
  • 29
  • 83
  • 106
  • This should help: https://stackoverflow.com/questions/2118364/how-to-identify-conflicting-commits-by-hash-during-git-rebase – Sam Jun 05 '17 at 10:56

1 Answers1

2

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

Bram Schoenmakers
  • 1,599
  • 14
  • 19
  • 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 01 '10 at 20:27