git rebase conflict was caused by which commit

Question

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?

Answer 1

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