diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md
index ab96e68..883dd3f 100644
--- a/Typical-Git-Workflow.md
+++ b/Typical-Git-Workflow.md
@@ -49,11 +49,14 @@ It's appreciated if every single commit in a branch on its own compiles on all s
 **Once your pull request is ready to be merged...**
 * From your branch, interactive rebase to squash all of the new commits (as a result of the pull request feedback) into the commits that they were addressing
  * `git checkout new-branch-name`
- * `git rebase -i HEAD~n`
-* Rebase `upstream/master` onto your branch to ensure that you have any changes made since your pull request was created
  * `git rebase -i upstream/master`
+  * Now, you should see a file containing all the commits on this branch.
+  * For all commits that address feedback, replace `pick` with `fixup`. Re order if required (beware, you might get conflicts at this stage! Resolve them carefully, then use `git rebase --continue`)
+  * You can also change commit messages by replacing `pick` with `reword`.
+  * Then follow the steps as directed by Git (These are not specific to Citra, so you shouldn't have a problem if you use Git regularly.)
+  * Rebase complete!
 * Update `origin/new-branch-name`
  * `git push origin new-branch-name --force`
 * Merge your branch in
   * Always merge using the >merge< button in the GitHub pull request
-  * If GitHub says the branch cannot be merged automatically, you've likely done something incorrectly (e.g. you did not fully rebase changes from `upstream/master` into your branch). If things don't work for you, don't hesitate to ask us for help @ #citra on [freenode](http://webchat.freenode.net/). Mastering Git is not as easy as it might sound, but we'll happily help you get started.
\ No newline at end of file
+  * If GitHub says the branch cannot be merged automatically, you've likely done something incorrectly (e.g. you did not fully rebase changes from `upstream/master` into your branch). If things don't work for you, don't hesitate to ask us for help @ #citra on [freenode](http://webchat.freenode.net/) or @ #citra-general on [Discord](https://citra-emu.org/discord/). Mastering Git is not as easy as it might sound, but we'll happily help you get started.
\ No newline at end of file