# git rebase conflicts?

1 messages from 2011-02-03 to 2011-02-03. Participants: KAJed.
Thread: https://gitlist.dev/t/26403

## KAJed, 2011-02-03 21:06

Subject: git rebase conflicts?
Message-ID: <1296767213445-5990493.post@n2.nabble.com>
URL: https://gitlist.dev/e/1296767213445-5990493.post%40n2.nabble.com

```

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.

```