but-which-commit-from-master-did-we-conflict-with-exactly

= But which commit from master did we conflict with exactly?

`git rebase` does not tell you that, and that sucks.

We only know which commit from the feature branch caused the problem.

Generally we can guess or it is not needed, but `imerge` does look promising: https://stackoverflow.com/questions/18162930/how-can-i-find-out-which-git-commits-cause-conflicts

Back to article page