Improving a git rebase workflow
git
Solution
Your shortest amount of steps had a total of 6 steps (no changes case):
git checkout -b feature
.. make some commits
git checkout master
git pull
git merge feature
git push
This technique should work in both cases (6 steps as well):
git checkout -b feature
.. make some commits
git fetch
git rebase origin/master
git checkout master
git merge feature
Problem
I'm currently working a very simple git workflow using feature branches and rebasing on to master before pushing. ``` git checkout -b feature .. make some commits git checkout master git pull ``` If there are no changes from the pull: ``` git merge feature git push ``` If there are changes: ``` git checkout feature git rebase master git checkout master git merge feature git push ``` While has been great to learn how git works but it's getting a little tedious to type all the time and I suspect there's some faster ways to achieve what I'm doing but can't find them.