From 77be53265cd73ab15c7058551e82a03fd1d022bf Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sat, 9 Apr 2016 19:20:44 +0100 Subject: [PATCH] Update Resolving Conflicts page content Replace references to GfW with GitHub Desktop. --- docs/contributing/Resolving-Conflicts.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributing/Resolving-Conflicts.html b/docs/contributing/Resolving-Conflicts.html index c5b4f57..02cd5a8 100644 --- a/docs/contributing/Resolving-Conflicts.html +++ b/docs/contributing/Resolving-Conflicts.html @@ -5,7 +5,7 @@ title: Resolving Conflicts

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. This page 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.

-

Below is some guidance for resolving conflicts using GfW and the shell where necessary.

+

Below is some guidance for resolving conflicts using GitHub Desktop and the shell where necessary.

Merging Conflicts In The Same File

@@ -19,7 +19,7 @@ title: Resolving Conflicts

In the shell, enter git add <file> to mark the file you manually merged as resolved. Once all the unmerged paths have been resolved, enter git rebase --continue to finish the merge. You can now close the shell window.

-

Back in the GfW window, click the "sync" button to update the online repository with your merged revision. You're done!

+

Back in the GitHub Desktop window, click the "sync" button to update the online repository with your merged revision. You're done!

An Example