views:

89

answers:

1

I'm using

 git rebase -p -i SHA1^

And moving a single commit backwards in time to just after SHA1. The commit consists of a WAV file, so there's no way this is breaking my code.

Seemingly unrelated files pop up in conflicts later in history. Why am I getting these conflicts during the rebase in this scenario? Isn't -p enough to keep the relationship to other parts of history intact ? There is something about rebasing I'm not catching totally here...

+1  A: 

A commit is never just a single file. A commit is the entire tree as of that moment. And depending on the common merge base of the commit your trying to move and the commit your trying to move it onto, there could be quite a few changes.

Randal Schwartz
Do you mean to say that by trying to move a single pick 2000 commits back in time using rebase, I am actually moving the entire tree state backwards, not just the diff that the single commit creates ? That would explain things
krosenvold
So I'm moving the full committ and not just the diff COMMIT^..COMMIT ?
krosenvold