add celebration gifs and small content

20uf · Sep 27, 2017 · 11e7327 · 11e7327
1 parent 99d4d24
commit 11e7327
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/paths/merge-conflict/08-ide-atom.md b/paths/merge-conflict/08-ide-atom.md
@@ -34,4 +34,6 @@ main-content: |
   1. Select the **Use me** option for your changes.
   1. Enter `git add _config.yml` followed by `git commit -m "Add my config changes"` and enter enter.
   1. Congratulations, you resolved a merge conflict locally with the Atom editor!
+
+  ![shooting star tina](https://media.giphy.com/media/XaFhFM2lVRoVa/giphy.gif)
 ---
diff --git a/paths/merge-conflict/09-ide-vs-ext.md b/paths/merge-conflict/09-ide-vs-ext.md
@@ -11,7 +11,7 @@ sidebar:
 main-content: |
   The [GitHub Extension for Visual Studio](https://visualstudio.github.com/) editor enables you to identify the difference between the two files and automatically fix the merge conflicts by selecting a specific branch.
 
-  While the merge conflict tool found in Visual Studio isn't specific to having the GitHub Extension installed, the extension allows you to log in quickly (even with two factor authentication), and utilize aspects of GitHub such as issues, pull requests, and quickly clone repositories.
+  While the merge conflict tool found in Visual Studio isn't specific to having the GitHub Extension installed, the extension allows you to log in quickly (even with two factor authentication), and utilize aspects of GitHub such as pull requests and quickly clone repositories.
 
   [![instructions for this activity](../../images/gifs/merge-conflict/vs-merge.gif)](../../images/gifs/merge-conflict/vs-merge.gif)
 
@@ -31,7 +31,7 @@ main-content: |
 
       > If you haven't saved the changes you made to the `_config.yml` file you will be prompted to save your changes.
 
-  1. With the `_config.yml` file staged, enter a commit message and click **Commit Staged**.
+  1. With the '_config.yml' file staged, enter a commit message and click **Commit Staged**.
   1. Checkout the `master` branch from the branch selection tool in the bottom right corner.
   1. Select the **Manage Branches** option from the branch selection tool in the bottom right corner.
   1. Right-click the _master_ branch and select the **Merge From...** option.
@@ -45,4 +45,5 @@ main-content: |
   1. Enter a commit message in the commit message field and click the **Commit Staged** button.
   1. Congratulations, you resolved a merge conflict locally with the GitHub Extension for Visual Studio!
 
+  ![belcher children dancing](https://media.giphy.com/media/e07y5SEwFMDm0/giphy.gif)
 ---
diff --git a/paths/merge-conflict/11-ide-vs-code.md b/paths/merge-conflict/11-ide-vs-code.md
@@ -34,4 +34,6 @@ main-content: |
   1. Remove the merge conflict markers and the content you do not want to keep.
   1. Enter `git add _config.yml` followed by `git commit -m "Add my config changes"` and enter enter.
   1. Congratulations, you resolved a merge conflict locally with the Visual Studio Code editor!
+
+  ![bob excited about growing vegetables](https://media.giphy.com/media/3o72FlfJRccOPSYgO4/giphy.gif)
 ---