Re: Question concerning merge behavior

I suggest that you read (all of) http://www.git-scm.com/book and then perhaps ask a question based on more understanding of the merge model and ancestry tracking. The short answer is that git will work quite well in terms of conflict management if your development practices are sane. pg

Question concerning merge behavior

View this message in context: http://git.661346.n2.nabble.com/Question-concerning-merge-behavior-tp7563780.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mo