loot/loot.github.io
0
0
Fork 0
mirror of https://github.com/loot/loot.github.io.git synced 2026-07-27 14:13:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update How To Contribute page content

Browse Source 
Replace reference to repository master branch with default branch, and
GFW with GitHub Desktop.
This commit is contained in:
Oliver Hamlet
2016-04-09 19:46:23 +01:00
parent 578f917601
commit 1a2a4024b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/contributing/How-To-Contribute.html
+2 -2
View File
@@ -43,8 +43,8 @@ title: How To Contribute
<ol>
<li>Make sure that your local repository is in sync with the online repository before and after you make any changes. This helps to avoid conflicts.</li>
<li>It's always best to make commits in your own branch, and merge them into the repository's <code>master</code> branch when you're done working. For one-off commits the advantage is not so clear, but if you are making a set of commits with a common theme, a branch will help keep things organised.</li>
<li>If you have committed changes to your local repository, and someone else synced their changes to the online repository after you last synced, then you may need to manually merge the changes. You'll know if you have to do this because GFW will give you an error message when you try to sync, in which case see <a href="Resolving-Conflicts.html">Resolving Conflicts</a>.</li>
<li>It's always best to make commits in a new branch, and merge them into the repository's default branch when you're done working. For one-off commits the advantage is not so clear, but if you are making a set of commits with a common theme, a branch will help keep things organised.</li>
<li>If you have committed changes to your local repository, and someone else synced their changes to the online repository after you last synced, then you may need to manually merge the changes. You'll know if you have to do this because GitHub Desktop will give you an error message when you try to sync, in which case see <a href="Resolving-Conflicts.html">Resolving Conflicts</a>.</li>
<li>You should also have a read of the <a href="/docs/team/Team-Policies.html">Team Policies</a> and <a href="/docs/team/Team-Member-Responsibilities.html">Team Member Responsibilities</a> pages to familiarise yourself with their contents.</li>
</ol>