13.06.2020, 22:22, "Junio C Hamano" <gitster@xxxxxxxxx>: > Christian Couder <christian.couder@xxxxxxxxx> writes: > >> My opinion is that it would be nice to have something like git-imerge >> integrated into Git. > > I am not sure what you mean by "integrated into", but if you are > talking about somehow reinventing it, I do not think it is a good > idea at all. "imerge" works quite well already. No it doesn't. It has performance issues which makes it practically useless on the large scale repositories because of slow progress even on fastest machines. See for example https://github.com/mhagger/git-imerge/issues/66 https://github.com/mhagger/git-imerge/issues/149 Also, maybe a bit irrelevant, but it was recently removed from Gentoo because it didn;t work with Python >= 3.7
