### Checkout a new working branch ### git checkout -b ### Make Changes ### git add git commit -m 'description of changes' ### Sync with remote ### git checkout develop git pull --rebase ### Update branch ### git checkout git rebase develop ### Conflicts ### open up the files and fix them git add git rebase --continue ### Push Changes ### git push