MelissaKaulfuss/git_workflow.md

Created April 10, 2018 03:27

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/MelissaKaulfuss/b8fcbdf68f8eff782807aee8c2416eda.js"></script>
Save MelissaKaulfuss/b8fcbdf68f8eff782807aee8c2416eda to your computer and use it in GitHub Desktop.

Download ZIP

Git rebase workflow

Raw

git_workflow.md

Nice git workflows

Keep commits small/atomic
Make use of fixup commits (for related changes) git commit --fixup sha
If responding to a request/comment in PR reply with a comment like "Done in <commit-sha>", then:

git push origin head
git rebase -i origin/master --autosquash
Once there's a nice history: git push origin head -f
git checkout master && git merge br-name --ff-only

Remember to run your specs again!
git push origin master
Delete remote branch
Delete local branch: git branch -d branch/name

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment