git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: William Tanksley <wtanksleyjr+git@gmail.com>
To: git@vger.kernel.org
Subject: Can git be stopped from inserting conflict markers during a merge?
Date: Sat, 8 Mar 2008 17:55:47 +0000 (UTC)	[thread overview]
Message-ID: <loom.20080308T174918-559@post.gmane.org> (raw)

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


             reply	other threads:[~2008-03-08 20:25 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-08 17:55 William Tanksley [this message]
2008-03-08 20:51 ` Can git be stopped from inserting conflict markers during a merge? Linus Torvalds
2008-03-08 22:24   ` Martin Langhoff
2008-03-08 21:03 ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=loom.20080308T174918-559@post.gmane.org \
    --to=wtanksleyjr+git@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).