From: KAJed <kailey.joanette@gmail.com>
To: git@vger.kernel.org
Subject: git rebase conflicts?
Date: Thu, 3 Feb 2011 13:06:53 -0800 (PST) [thread overview]
Message-ID: <1296767213445-5990493.post@n2.nabble.com> (raw)
If I'm rebasing the history on a project, basically squashing all commits to
a point, why are there conflicts?
Keep in mind this is a flat history. Basically the history came from SVN
and now I'm trying to squash that down to "this was the stable migration
from SVN".
So howcome when rebasing it causes a conflict?
Some times its files that are missing, or being deleted.
Some times I can see it's because an empty directory (at least that makes
sense with git).
Any other suggestions? What I really want is there to either be NO
conflicts, or simply conflict resolve with the correct (newer) file.
--
View this message in context: http://git.661346.n2.nabble.com/git-rebase-conflicts-tp5990493p5990493.html
Sent from the git mailing list archive at Nabble.com.
reply other threads:[~2011-02-03 21:07 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=1296767213445-5990493.post@n2.nabble.com \
--to=kailey.joanette@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 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).