Stephen Morton <stephen.c.mor...@gmail.com> writes: > - So, the question is: what is the best git-like way to a) record the > merge in a proper way that will allow any subsequent merges to occur > properly (most important) and additionally b) record the intermediate > conflict fixing if possible.
You are aware of `rerere` I guess, right? I don't know if you can share the recorded resolutions though. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Any sufficiently advanced technology is indistinguishable from a rigged demo. — Andy Finkel -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: PGP signature
