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

Merge problems.

From
IMIan Molton <spyro@f2s.com>
Date
Feb 4, 2006, 22:50 UTC
Message-ID
<43E52FD3.20202@f2s.com>
Doing the following:

git checkout -b mywork v2.6.12 # work, work, work git commit -a git merge "Merging happily." mywork v2.6.15

At theat point I get a merge failure - I assume that means I've got conflicts. I forgot to not the exact error.

so I can see unmerged files using git ls-files --unmerged which lists a lot of SHA1 hashes and paths. but most of the files in the list I havent touched! why would they have any conflicts? surely they would simply update 2.6.12->2.6.15 ?

The SHA1 hashes are all listed at least twice per file too, eg.

100644 d058e65daf19f4bb8c257e2273f4c935ccee5121 1 Documentation/DocBook/scsidrivers.tmpl 100644 d058e65daf19f4bb8c257e2273f4c935ccee5121 2 Documentation/DocBook/scsidrivers.tmpl

What does this mean?
How do I work out what needs merging byhand?
Next: Linus Torvalds
Message 1 of 2 in “Merge problems.”
  1. Ian MoltonFeb 4, 2006
  2. Linus TorvaldsFeb 5, 2006

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.