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

Re: Question concerning merge behavior

From
GTGreg Troxel <gdt@ir.bbn.com>
Date
Jul 26, 2012, 12:21 UTC
Message-ID
<rmiipdapvax.fsf@fnord.ir.bbn.com>
In-Reply-To
<1343302234333-7563780.post@n2.nabble.com>
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.

Previous: Defcon0
Message 2 of 2 in “Question concerning merge behavior”
  1. Defcon0Jul 26, 2012
  2. Greg TroxelJul 26, 2012

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.