{"thread":{"id":"26403","subject":"git rebase conflicts?","startedAt":"2011-02-03T21:06:53Z","lastAt":"2011-02-03T21:06:53Z","messageCount":1,"participants":["KAJed"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"160352","messageId":"1296767213445-5990493.post@n2.nabble.com","threadId":"26403","inReplyTo":null,"subject":"git rebase conflicts?","fromName":"KAJed","fromEmail":"kailey.joanette@gmail.com","sentAt":"2011-02-03T21:06:53Z","receivedAt":"2011-02-03T21:06:53Z","isPatch":false,"sender":{"key":"kailey.joanette@gmail.com","avatar":null},"body":"\nIf I'm rebasing the history on a project, basically squashing all commits to\na point, why are there conflicts?\n\nKeep in mind this is a flat history.  Basically the history came from SVN\nand now I'm trying to squash that down to \"this was the stable migration\nfrom SVN\".\n\nSo howcome when rebasing it causes a conflict?\nSome times its files that are missing, or being deleted.\nSome times I can see it's because an empty directory (at least that makes\nsense with git).\n\nAny other suggestions?  What I really want is there to either be NO\nconflicts, or simply conflict resolve with the correct (newer) file.\n-- \nView this message in context: http://git.661346.n2.nabble.com/git-rebase-conflicts-tp5990493p5990493.html\nSent from the git mailing list archive at Nabble.com.\n"}]}