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

[Question] Why sometimes the unmerged file doesn't contains any conflicts

From
Johnny Lee <johnnylee194@gmail.com>
Date
Apr 13, 2009, 02:35 UTC
Message-ID
<488807870904121935nab40117n56070570ecd31aa7@mail.gmail.com>
Hi all,

Sometimes when I merge two branches, the unmerged files don't contain any conflicts. When I edit the file, I can't find any conflict information. Usually all I have to do is manually "git add" them.

I do the merge with a clean workspace, all changes have been committed. This doesn't happen all the time, usually the unmerged files contains the correct conflict information inside.

Do you know what's going on here? The version of my git is: 1.6.2.1

Thanks for your consideration.

Regards, Johnny

-- 
we all have our crosses to bear
Next: Junio C Hamano
Message 1 of 3 in “[Question] Why sometimes the unmerged file doesn't contains any conflicts”
  1. Johnny LeeApr 13, 2009
  2. Junio C HamanoApr 13, 2009
  3. Johnny LeeApr 13, 2009

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.