New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem with feature branches and rebasing #270

Open
fgarcia opened this Issue Oct 15, 2012 · 0 comments

Comments

Projects
None yet
1 participant
@fgarcia

fgarcia commented Oct 15, 2012

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

git rebase develop

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment