Join GitHub today
Problem with feature branches and rebasing #270
My git-fu level is not high enough to fully grasp the mechanics of this problem, so I hope someone can get it right.
Every so often I tend to do an interactive rebase of my feature branches to improve my commit history. However, after doing one, my develop branch (the one from where I branch my features) goes wild pointing way back in time.
After doing an interactive rebase I get lots of problems merging back my feature branches. However all this is solved if before finishing my branch, I rebase the develop branch it with
This problem happens to me even when there is no single commit in "develop" after my feature branch, and when the rebase only affects the latest changes to the feature.