From 214cca1b97e0ed41233cff9c22ce0db40bc2c142 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 23 May 2014 15:52:47 -0700
Subject: [PATCH] Updated Squashing Commits (markdown)

---
 Squashing-Commits.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Squashing-Commits.md b/Squashing-Commits.md
index 2324624..00b4120 100644
--- a/Squashing-Commits.md
+++ b/Squashing-Commits.md
@@ -10,6 +10,7 @@ These directions assume that you named the Mozilla pdf.js repo (not your fork) `
 ```
 1. Then you simply need to do:
 ```bash
+git merge upstream/master
 git squash super-feature
 ```
 1. That will bring up your editor to allow you to put in the commit message you want. After entering a commit message, press Esc and type `:wq` to exit the editor (if the editor is set to vim).