Both great ideas! And have the same theory right? Merge until you come across the first conflicting commit in a branch to make the conflicts smaller right? Thanks so much for your help! Any alternative ideas? I'm definitely going to try both techniques, although imerge seems like an automation of the first idea. Anybody ever think of rewriting the imerge tool in C or whatever to get in merged into mainline git? Potentially I could do it as part of my masters thesis if Michael H and the git open source community agreed? Regards, Eric Curtin Software Engineer Ovens Campus, Cork, Ireland Dell EMC From: Christian Couder <christian.couder@xxxxxxxxx> Sent: Saturday 13 June 2020 13:08 To: Curtin, Eric <Eric.Curtin@xxxxxxxx> Cc: git@xxxxxxxxxxxxxxx <git@xxxxxxxxxxxxxxx>; Geary, Niall <Niall.Geary@xxxxxxxx>; rowlands, scott <Scott.Rowlands@xxxxxxxx>; Michael Haggerty <mhagger@xxxxxxxxxxxx> Subject: Re: Collaborative conflict resolution feature request [EXTERNAL EMAIL] Hi, On Fri, Jun 12, 2020 at 4:11 PM Curtin, Eric <Eric.Curtin@xxxxxxxx> wrote: > Is there any existing or upcoming feature in git that could help make conflict resolution a more distributed, collaborative kind of task? You might want to take a look at Michael Haggerty's 'git imerge': https://github.com/mhagger/git-imerge > 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 I also made the same suggestion on the issue. Best, Christian.
