Thread (7 messages) 7 messages, 4 authors, 2020-06-16

Re: Collaborative conflict resolution feature request

flat view

From: Christian Couder <hidden>
Date: 2020-06-13 17:10:34

On Sat, Jun 13, 2020 at 2:38 PM Curtin, Eric [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help