search

mhagger / git-imerge

Incremental merge for git
GNU General Public License v2.0
2.68k stars 126 forks source link

Question: can git-imerge product a list of all conflicts in advance and their associated commits? #209

Closed hpe-ykoehler closed 6 months ago

hpe-ykoehler commented 8 months ago

I am looking forward to use git-imerge in our feature branch integration process. In order to do so, and to reduce the time to resolve the conflicts, I was wondering if it would be possible to at the start of the merge generate a list of all conflicts with all associated commits so that we could create a "hook" list of people that needs to have their time reserved for this operation, so that we can summon them as needed.

I saw the git-imerge autofill command which I am not clear when and how to use it.

Thanks you.

mhagger commented 6 months ago

It can only determine the "merge conflict frontier" as described here, which is equivalent to the list of "blocker" commits on the frontier. Those are merges that definitely have to be done by humans. You can view the "merge conflict frontier" immediately after starting an imerge by running git imerge diagram.

But it can't determine what will happen outside of the "merge conflict frontier", where everything might go smoothly, or perhaps other blockers will be found that also have to be merged by hand. They will only be revealed after one or more conflicts have been resolved.

Hope that helps!