When I encounter a merge conflict using git rebase, how can I identify the source of the conflict in terms of commits, rather than just file difference
git rebase
To see the commit that was being applied when the conflict occurred, use...
git am --show-current-patch