* git rebase conflicts?
@ 2011-02-03 21:06 KAJed
0 siblings, 0 replies; only message in thread
From: KAJed @ 2011-02-03 21:06 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-03 21:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-03 21:06 git rebase conflicts? KAJed
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).