git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Can git be stopped from inserting conflict markers during a merge?

From
WTWilliam Tanksley <wtanksleyjr+git@gmail.com>
Date
Mar 8, 2008, 17:55 UTC
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
Next: Linus Torvalds
Message 1 of 4 in “Can git be stopped from inserting conflict markers during a merge?”
  1. William TanksleyMar 8, 2008
  2. Linus TorvaldsMar 8, 2008
  3. Martin LanghoffMar 8, 2008
  4. Jakub NarebskiMar 8, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.