From: Christian Couder Date: Sat, 13 Jun 2020 17:10:13 GMT Subject: Re: Collaborative conflict resolution feature request Message-ID: In-Reply-To: On Sat, Jun 13, 2020 at 2:38 PM Curtin, Eric wrote: > 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? (We usually reply inline instead of top-posting here.) My opinion is that it would be nice to have something like git-imerge integrated into Git.