diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md
index ca4ffc7..8638672 100644
--- a/Typical-Git-Workflow.md
+++ b/Typical-Git-Workflow.md
@@ -14,10 +14,10 @@ This is a guide to a typical Git workflow with Citra. It covers forking from the
 **Create a new branch**
 * Update your local `master` with `upstream/master` (if it's not a brand new GitHub fork)
  * `git checkout master`
- * `git pull upstream/master`
-* Update origin/master with `upstream/master` if you’d like
+ * `git fetch upstream && git rebase origin/master` or the equivalent `git pull upstream/master --rebase` (Note: `git pull upstream/master` is incorrect and may result in an undesired merge commit)
+* Update origin/master with `upstream/master`, if you’d like
  * `git push origin/master`
-* Create your branch from the latest master
+* Create your branch from the latest master (Note: please format-branch-names-like-this)
  * `git checkout -b new-branch-name`
 * Push your new branch to origin if you'd like
  * `git push origin new-branch-name`