joelataylor/git_techniques.md

Created September 2, 2015 19:23

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

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

Download ZIP

Git/GitHub Tips

Raw

git_techniques.md

Reference for Merging

http://blog.spreedly.com/2014/06/24/merge-pull-request-considered-harmful/#.VecUstNVhBd

git am -3 <url> where url is the Pull Request url.
Conflicts? I fix ’em and then git am --continue
Single commit? Append message: git commit --amend (tip: add Closes #XX to auto close the PR)
If multiple commits: git rebase -i origin/master squash em!

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