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

When a merge turns into a conflict

From
AKAnand Kumria <wildfire@progsoc.org>
Date
Dec 6, 2007, 04:49 UTC
Message-ID
<pan.2007.12.06.04.49.25@progsoc.org>
Hi,

I've just had an odd experience with git (1.5.3.1) and wondered if this was a known issue.

One of my co-developers has a project, with a README.txt file. I branch from it and begin some edits:

	- make it more AsciiDoc like (ala git)
	- put in the README.txt a few patches that need to be applied
I had no issues 'git add' the file, and performing changes.

However when my colleague came to merge my patches in; git complained that the file had conflict because:

	a. it found the ========= AsciiDoc header line
	b. it found the diff markers in the file

I do not know git well enough to know if this is a heurestic that can be tweaked via the config file or something else. I am presently learning git-filter-branch so I can prepare something to show -- but I just wanted to flag and see if anyone else had had the same issue.

Thanks, Anand

Next: Junio C Hamano
Message 1 of 2 in “When a merge turns into a conflict”
  1. Anand KumriaDec 6, 2007
  2. Junio C HamanoDec 6, 2007

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.