Skip to content

Instantly share code, notes, and snippets.

What would you like to do?
git work process by @ajjahn
git pull # Start with latest upstream
git checkout -b myfeature # Do some work in a separate branch
git add the_file
git commit -m 'blah blah blah' # Make as many commits as needed
# Fetch and rebase when finished (or as often as you want before pushing local changes)
git fetch master # Get any new upstream changes that may have been pushed
git rebase master # Plop my commits on top of master/resolve any conflicts
git checkout master
git merge myfeature
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.