Created
November 13, 2015 17:47
-
-
Save catmando/cf3001b19c60575b23e1 to your computer and use it in GitHub Desktop.
git work process by @ajjahn
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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