Learn More
Resend Email
2
Wack
7y

How to use git rebase when working with master and staging branch?

It might be a stupid question, but I really like the idea of creating a feature branch, work on it, if there are multiple commits squash them, rebase in top of master and then create a pull request from that branch to master.
It keeps the gut log pretty clean.

However, how would you do this, when not only working with a master branch but a staging/testing too?
Would you just rebase onto staging, merge to staging and when everything is fine, rebase onto master and merge again? Is there a netter way?

question

git

rebase

sqash
Favorite
Ranter
Comments
  • 2
    7y
    Rebasing a long-lived branch sounds like a bad idea. As long as you don't have hotfixes on master you can fast-forward. When FFs are not possible I'd probably settle on merges.
  • 0
    7y
    Where is the feature branch getting from originally? Usually as a rule of thumb I merge each branch to where it came from.
  • 2
    7y
    That way I can really feel like a git nazi. It's like being racist but with code
  • 0
    7y
    I guess you could simply use what you described for master, but on staging, and then fast-forward master to staging whenever the conditions for that are met.
  • 3
    7y
    I'm still a bit unsure of rebasing but I was doing some reading up on Git the other day and there was one bit of advice that stuck with me. Rebasing is fine for your own branches, but stick to good ol' merge for shared branches (like master, develop, staging etc.) where multiple people have work merged in to the same branch.

    But that's just me. 💁‍♀️
Related Rants
devRant © 2021 Hexical Labs LLC
Privacy Policy  |  Terms of Service
Add Comment