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

ID: git-tips/but-which-commit-from-master-did-we-conflict-with-exactly

 Top articles  Latest articles + New article in topic

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

Ciro Santilli 35  Updated 2025-03-25  +Created 1970-01-01

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: stackoverflow.com/questions/18162930/how-can-i-find-out-which-git-commits-cause-conflicts

 Read the full article

 New to topics? Read the docs here!