6 ms·
That's not how you do it. git checkout master git pull => fetch and merge the new things on master git checkout develop => go back
by schlupa 5y ago
That's not how you do it.
git checkout master
git pull => fetch and merge the new things on master
git checkout develop => go back to your work branch
git rebase master => simple rebase, no squash, no nothing. The conflicts are the same as you'd get with git merge
do not forget to force push the changes of your branch
git push origin --force develop => to update your branch on the server
- Shacklz 5y agoYou can skip the "checkout master + pull" part by using "git fetch origin master:master", or by using just "git fetch origin" and then "git rebase origin/master". Other than that, that's pretty much my workflow too :)
- schlupa 5y agoYes, I know. I just wanted to keep it at the simplest form.
- mixmastamyk 5y agoOk, thanks. Although making a one step process into five, doesn’t sound like a big win. Perhaps the shorter version is workable.