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 Resolving Conflicts page content

Browse Source 
Replace references to GfW with GitHub Desktop.
This commit is contained in:
Oliver Hamlet
2016-04-09 19:46:25 +01:00
parent 88cd4a15e6
commit 77be53265c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/contributing/Resolving-Conflicts.html
+2 -2
View File
@@ -5,7 +5,7 @@ title: Resolving Conflicts
<p>This is where GitHub Desktop falls short - to resolve conflicts, you're probably going to have to use the command line shell at some point. <a href="http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Private-Small-Team">This page</a> discusses the issue well, but is aimed at people who don't use a GUI client at all. It's still worth a read to get an understanding of the issues, and its diagrams are very good.</p>
<p>Below is some guidance for resolving conflicts using GfW and the shell where necessary.</p>
<p>Below is some guidance for resolving conflicts using GitHub Desktop and the shell where necessary.</p>
<h4>Merging Conflicts In The Same File</h4>
@@ -19,7 +19,7 @@ title: Resolving Conflicts
<p>In the shell, enter <code>git add &lt;file&gt;</code> to mark the file you manually merged as resolved. Once all the unmerged paths have been resolved, enter <code>git rebase --continue</code> to finish the merge. You can now close the shell window.</p>
<p>Back in the GfW window, click the "sync" button to update the online repository with your merged revision. You're done!</p>
<p>Back in the GitHub Desktop window, click the "sync" button to update the online repository with your merged revision. You're done!</p>
<h5>An Example</h5>