我怎么能确定什么提交导致冲突？

Question

I can see which files have merge conflicts, but those files only say what is from

develop

and what is from

feature/ticket-123

. How can I see the specific commits that cause the conflict, so I can resolve the conflict better?

I had a look at

How to resolve merge conflicts in Git?

, but I couldn't see anything that had this information

直到有人提出一个更好的答案，这是一个解决方法：在功能分支上做一个

git rebase develop

Answer 1