Home - Yellow-Team-Millerslab/GitPlayground GitHub Wiki

Welcome to the GitPlayground wiki!

Here are steps that demonstrate the day-to-day operations. Every step has a <1 minute-ish gif showing operations of the step.

Recommend Software:

1. VS Team explorer (come with Visual Studio)
2. Source Tree
3. Git Extension (Lack of Subtree support https://github.com/gitextensions/gitextensions/issues/1959)

• [Step 0] Best practices & Guidelines
• [Step 1] Clone the repo from VS2017
• [Step 1][Sourcetree] Add an existing local repo
• [Step 2] Create new branch in VS2017
• [Step 2][SourceTree] Create a new branch
• [Step 3] Delete a branch
• [Step 4] Commit changes
• [Step 5] Handle merge with conflicts in VS2017
• [Step 6] Undo a commit locally (Reset)
• [Step 7] Merge the part you need with Cherry pick
• [Step 7][SourceTree] Merge the part you need with Cherry pick
• [Step 8] Avoid unnecessary merge with Rebase
• [Step 8][SourceTree] Avoid unnecessary merge with Rebase
• [Step 9] Denote specific release versions with Tags
• [Step 9][SourceTree] Denote specific release versions Tags
• [Step 10][SourceTree] Save unfinished changes with stash
• [Step 11] Create Pull Request
• [Step 12] Merge a pull request
• [Step 13][Workflow] Git flow
• [Step 13][Workflow] Github flow.
• [Step 14] Multiple Work Place
• [Step 15][SourceTree] Pull with Rebase