> An aside that probably would not directly help Eric, but I know the > above workflow helps reasonably well. The 'pu' branch is rebuilt > not on top of 'next', but is rebuilt with all topics (including > those already in 'next') in flight directly on top of 'master', > which serves as a way to anticipate conflicts that will require > resolution in the future before the topics can enter 'next' branch. Out of all the currently available options this solution helps. Thanks Junio! I played with incremental merge techniques this weekend. One problem with incrementally merging is that you start fixing conflicts that are later invalidated by subsequent commits. So it seems you end up doing more conflict resolution than necessary. Unless I'm misusing the technique. I think in order to create collaborative distributed conflict resolution, you'd probably need a new type of commit a "partial-merge" commit, that is like a pseudo-commit that you can push and doesn't break builds. It would be a neat feature, at least for my team! Regards, Eric Curtin Software Engineer Ovens Campus, Cork, Ireland Dell EMC
