3 ms·
It's quite possible to follow this or a similar workflow with merge / pull requests. In fact, this describes pretty closely what I do. I work off master, amendi
by Aqueous 7y ago
It's quite possible to follow this or a similar workflow with merge / pull requests. In fact, this describes pretty closely what I do. I work off master, amending a single commit, periodically squashing or fixing up newer commits, and periodically rebasing. Then when I'm ready to deploy I push my local master to a remote staging branch (git push origin master:some_new_remote_branch_issue_xxxxx) and open a MR on Gitlab. Then, when the MR gets merged and deployed, I rebase my local master against remote master and my commit gets "eaten", thus putting me back on a clean master branch. I never leave master locally. Rinse, repeat.
How is this different from what you are suggesting?