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.