Merge pull request microsoft#70 from hueitan/Add-Merge-Conflicts-gif

Add Resolve Merge Conflicts Gif
suzyStudy · Oct 27, 2017 · ae32de2 · ae32de2
2 parents 57c3b88 + cef4a62
commit ae32de2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -854,9 +854,10 @@ View diff decorations in editor. See [documentation](https://code.visualstudio.c
 
 ## Resolve merge conflicts
 
-During a merge, click the Source Control button in the Activity Bar and make changes in the diff view.
+During a merge, click the Source Control button in the Activity Bar and make changes in the diff view. Select and accept current, incoming or both changes in just one click.
 
 ![git icon](/media/git_icon.png)
+![resolve merge conflicts](/media/resolve_merge_conflicts.gif)
 
 ## Setup VS Code as default merge tool
 

diff --git a/media/resolve_merge_conflicts.gif b/media/resolve_merge_conflicts.gif