From: bill lam <cbill.lam@gmail.com>
To: git <git@vger.kernel.org>
Subject: unrelated file conflict during rebase
Date: Thu, 15 Oct 2009 18:35:26 +0800 [thread overview]
Message-ID: <20091015103525.GI27040@debian.b2j> (raw)
Something I change a file in rebase -i. During the process, for some
commits, git said some other apparently unrelated files (not that I
had changed) caused merged conflicts usually both modified. Why did
this happen?
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
reply other threads:[~2009-10-15 10:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20091015103525.GI27040@debian.b2j \
--to=cbill.lam@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.