From: Ian Molton <spyro@f2s.com>
To: git@vger.kernel.org
Subject: Merge problems.
Date: Sat, 04 Feb 2006 22:50:59 +0000 [thread overview]
Message-ID: <43E52FD3.20202@f2s.com> (raw)
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 reply other threads:[~2006-02-04 22:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-04 22:50 Ian Molton [this message]
2006-02-05 0:13 ` Merge problems Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43E52FD3.20202@f2s.com \
--to=spyro@f2s.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).