Having finished an update, these are the steps to merge back into the develop branch:
- Pull any changes on github (you might want to stash any workings)
git checkout develop
git pull
- Apply changes to updated branch:
git checkout my-update-branch
git rebase develop my-update-branch
- Merge changes
git checkout develop
git merge my-update-branch
- Push back to github
git push
This is the point to create (or resume) a working branch and run git stash pop to retrieve any stashed settings files