Setting up git: Difference between revisions

982 bytes added ,  07:52, 29 December 2014
Adds a guide for Squashing commits easily in TortoiseGit
imported>Jordie0608
No edit summary
imported>Remie Richards
(Adds a guide for Squashing commits easily in TortoiseGit)
Line 102: Line 102:
* Fill out a summary and then create the pull request.
* Fill out a summary and then create the pull request.
* You're done! In many cases there will be issues pointed out by other contributors, unfortunate merge conflicts, and other things that will require you to revisit your pull request.
* You're done! In many cases there will be issues pointed out by other contributors, unfortunate merge conflicts, and other things that will require you to revisit your pull request.
* Optionally, view step 13 for a guide on cleaner commit logs, '''cleaner commits help maintainers review!'''


== Step 12 - Checking Out Github PRs Locally (Optional) ==
== Step 12 - Checking Out Github PRs Locally (Optional) ==
Line 116: Line 117:
*Fetch from the upstream remote.
*Fetch from the upstream remote.
*To check out a particular pull request, use Switch/Checkout and select the branch from the drop-down list.
*To check out a particular pull request, use Switch/Checkout and select the branch from the drop-down list.
== Step 13 - Clean commits (Optional) ==
*'''This is a guide specifically for TortoiseGit, our recommended client'''
* Your commit logs are filthy, full of one or two line commits that fix an error that makes you look bad, and the commit is called "Whoops" or "oops"
* Navigate to your '''local version of the branch'''
* Ensure it is up to date with the '''remote'''
* Go to '''Show log'''
* Select all the commits associated with this change or PR
* Right click and choose '''Combine to one commit'''
* This will open up the standard commit interface for TortoiseGit, with the commit logs of the selected commits merged together
* Perform the normal routine for a commit
* Go to '''push''' your branch to the '''remote branch'''
* Ensure '''Force Overwrite Existing Branch (may discard changes)''' to ensure the PR/Remote updates to contain just this squashed commit
{{Contribution guides}}
{{Contribution guides}}
[[Category:Game Resources]] [[Category:Guides]]
[[Category:Game Resources]] [[Category:Guides]]