From: William Tanksley <wtanksleyjr+git@gmail.com>
Date: Sat, 08 Mar 2008 17:55:47 GMT
Subject: Can git be stopped from inserting conflict markers during a merge?
Message-ID: <loom.20080308T174918-559@post.gmane.org>

I started using Mercurial a while ago, and I'd like to move up to git (for a
number of reasons). The one thing that's stopping me is that (having recently
escaped subversion and cvs) I'm now used to NOT having to worry about conflict
markers being shoved into files. To put it simply, I really like how Mercurial
does that one thing.

So, given the git is probably the ultimate in configurability, what do I need to
do to make it not insert merge markers?

Thanks for a great VCS.

-Wm