Diane Gasselin <diane.gasselin@xxxxxxxxxxxxxxx> writes: > Afterwards, we thought about working on git-merge. > Actually, when having some local changes in some files > that would be overwritten by merge, git-merge aborts giving the > first file for which there is a problem. That's a nice bite-sized problem to tackle. Thanks (and thank you, Matthieu). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html