Updated Branching and Merging (markdown)

Branching-and-Merging.md

@@ -39,6 +39,8 @@ We want a merge commit present for all code merged from PRs, even if that PR is
 # on your_branch_name
 git fetch
 git rebase origin/master
+# if there are conflicts at this point, ask the PR creator to fix them. run `git rebase --abort` to abort
+# if no conflicts, proceed ...
 git checkout master
 git pull
 git merge --no-ff your_branch_name