Created Branching / Merging (markdown)

Branching---Merging.md

@@ -0,0 +1,33 @@
+## Start all work in a new branch off of master
+
+```
+git fetch
+git checkout -b new_branch origin/master
+```
+
+## Rebase onto master daily
+
+This reduces merge conflicts in the future
+
+```
+git fetch
+git rebase origin/master
+```
+
+## Clean up your commits before creating a PR
+
+```
+git fetch
+git rebase -i origin/master
+git push -u origin your_branch_name
+```
+
+## Rebase and non-ff-merge into master when you're done
+
+```
+git fetch
+git rebase origin/master
+git checkout master
+git pull
+git merge --no-ff your_branch_name
+```