Add GitHub tips and tricks article

Author: JonathanFingold

contributor-guide/contributor-guide-index.md

@@ -18,15 +18,17 @@ ms.author: tysonn
 
 ## Authoring articles: tools, processes, guidance
 
-- [Tools and setup for authoring in GitHub](tools-and-setup.md)
-- [Git commands for creating a new article or updating an existing article](git-commands-for-master.md)
+- Git and Git-adjacent
+  - [Tools and setup for authoring in GitHub](tools-and-setup.md)
+  - [Git commands for creating a new article or updating an existing article](git-commands-for-master.md)
+  - [How to undo almost anything with Git (GitHub blog)](https://github.com/blog/2019-how-to-undo-almost-anything-with-git)
+  - [Pull request etiquette and best practices for Microsoft contributors](contributor-guide-pull-request-etiquette.md)
+  - [Quality criteria for pull request review](contributor-guide-pr-criteria.md)
+  - [Pull request comment automation](contributor-guide-pull-request-comments.md)
+  - [GitHub tips and tricks](github-tips-and-tricks.md)
 - [File names and locations for Bot Framework technical articles](file-names-and-locations.md)
 - [Linking guidelines](create-links-markdown.md)
 - [Retire or rename an article](retire-or-rename-an-article.md)
-- [How to undo almost anything with Git (GitHub blog)](https://github.com/blog/2019-how-to-undo-almost-anything-with-git)
-- [Pull request etiquette and best practices for Microsoft contributors](contributor-guide-pull-request-etiquette.md)
-- [Quality criteria for pull request review](contributor-guide-pr-criteria.md)
-- [Pull request comment automation](contributor-guide-pull-request-comments.md)
 
 <!-- [Git commands for staging an article on the internal preview site](./git-commands-for-sandbox.md)-->
 

contributor-guide/github-tips-and-tricks.md

@@ -0,0 +1,16 @@
+# Tips and tricks for working with GitHub
+
+## GitHub Desktop
+
+### To make sure your local copy is completely in sync with the remote
+
+Sometimes your local copy of a repo gets so out of sync with the one on GitHub, it's just easier to re-clone the repository.
+
+1. Make sure any local changes you want to keep are stashed outside of the local copy of the repo. If you don't have any work in progress, this may not be necessary.
+1. Delete the local root directory for the repo.
+1. Open GitHub Desktop and try to set the current repo to the one in question.
+1. GitHub Desktop will tell you it can't find the local folder and ask you if you want to re-clone the repo.
+1. Re-clone the repo. This may take a minute or two as the app downloads all the files from the remote GitHub repo.
+1. If you stashed any changes:
+    1. Select the branch you had been working in.
+    1. Fetch, and copy your changes back into the local repo.