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...