Hi Guys, Sometimes in our private git instance in the company I work for we merge branches that have been forked for months and there can be several or more people involved in the conflict resolution. At the moment we have two options: - One person, a branch manager, solves them by ringing people, holding meetings, using best judgement, etc. - Somebody solves the conflicts they are involved with, marks everything as resolved and pushes (leaving <<< ==== >>>> delimiters in for unsolved conflicts) for the next person to continue. This sort of works although you falsely mark everything as resolved, leaving merge tools useless and many broken, unbuildable commits around in the branch. Note: rebase and squashing commits is banned in our org, basically anything that would rewrite history on a remote branch. Is there any existing or upcoming feature in git that could help make conflict resolution a more distributed, collaborative kind of task? I also opened this as an issue in github as I feel it could be solved by either tool potentiall: https://github.com/isaacs/github/issues/1816 Regards, Eric Curtin Software Engineer Ovens Campus, Cork, Ireland Dell EMC
