git checkout development # load development branch
git pull origin # synch with remote
git checkout -b myfeature # create new feature branch and check out
# commit changes
git checkout development # go back to development
git pull origin # see if any changes from upstream
if there were changes, going to rebase on my feature branch:
git checkout myfeature
git rebase development # handle any merge conflicts and commit
Now i can merge to development and push:
git checkout development
git merge --no-ff myfeature # handle any merge conflicts
git push origin development
git checkout development
git pull origin
# make some commits..
git push origin development
if there are upstream changes it will warn and need to rebsae/merge
git fetch origin # gets the remote branch without merging
git rebase origin/development #rebase from the remote branch
# handle any conflicts, and commit them
git push origin development