On 09/23/2011 09:14 PM, Jon Forrest wrote:
Thanks to (almost) everyone who has responded. I'm hoping that others new to Git will benefit from this discussion.
It does, it does...I'm working on an internal parallel documentation on using Hg and Git and this conflict resolution topic is... important.
-- RMA. -- 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