On 15/06/2020 10:28, Curtin, Eric wrote: > 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! One thing I did note, from your prompting, is that merge doesn't take any `-- <files>` options which could allow a quick way of selecting just the few files that you, or the specific dev, is able to merge, so as to create a partial merge on your side branch, and leave behind the remaining difficult conflicts to be resolved later by the appropriate dev in a sequence of rolling partial merges. It could be effectively a special strategy. IIUC the '--' separator is already supported by the underlying parser code, so may not be that hard? (perhaps a local contribution to the codebase;-). Just a thought. Philip
