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

possibly a spurious conflict in a three way merge

From
Mmeanlogin@gmail.com <meanlogin@gmail.com>
Date
Aug 7, 2014, 16:30 UTC
Message-ID
<53E3A99E.1090102@gmail.com>
git 2.0.4 on ubuntu 14.04 64
1. new repo
2. commit test.txt to master:
line1
line1
3. branch and checkout branch1
4. make and commit the following change to branch1:
#line1
#line2
5. checkout master
6. make and commit the following change to master:
line1
#line2
7. merge branch1, git sees a conflict:
<<<<<<< HEAD
line1
=======
#line1
 >>>>>>> branch1
#line2

Why? The first line changed in branch1 but not in master so a 3 way merge should take branch1 changes. Beyond Compare ( used as a mergetool) does not flag any conflicts.

Next: Jonathan Nieder
Message 1 of 2 in “possibly a spurious conflict in a three way merge”
  1. meanlogin@gmail.comAug 7, 2014
  2. Jonathan NiederAug 7, 2014

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.