Slashdev Wiki

This is an old revision of the document!

---

got a new task, branch name “work” could be anything

git checkout -b work

edit, commit, edit, commit, edit, commit

tested and ready to push upstream

check to see if someone pushed upstream while I worked

git checkout master
git pull

Already up to date? skip ahead to merge Commits pulled in? we should rebase our work

git checkout work
git rebase master''

ready to merge and push

git checkout master
git merge work
git push origin master''