Provide a bit more clarity in the README file for updating.

BUG=766721

Change-Id: I0d62c8e718714ad227f579d5c41ed34a77c47110

1 files changed, 14 insertions, 3 deletions

diff --git a/README.chromium b/README.chromium
index 1c3a81f3..4e4642fe 100644
--- a/README.chromium
+++ b/README.chromium
@@ -21,6 +21,17 @@ build/Release+Asserts/bin) then do the following:
   git remote add upstream https://repo.or.cz/nasm.git
   git fetch upstream
   git merge upstream/master
+
+  # Maybe use git mergetool to resolve any conflicts with local patches.
+
+  # ***DO NOT USE*** git cl upload for this part or you will spam every author
+  # who committed something upstream with a Gerrit issue... :O You must also
+  # have the correct Gerrit permissions from one of the OWNERS to do this.
+  git push origin master
+
+  # You can safely use git cl upload for all of your own modifications past this
+  # point; I.e., once you have pushed all the commits from the git merge.
+
   CC=clang CXX=clang++ ./autogen.sh
   CC=clang CXX=clang++ ./configure
   make perlreq
@@ -33,12 +44,12 @@ build/Release+Asserts/bin) then do the following:
   git commit -a
 
 In the event any new config.h flags are added, you may need to regenerate the
-config.h for each platform. You may be able to just copy new flags into all
+config.h for Linux and Mac. You may be able to just copy new flags into all
 platform configurations, but this may not always work.
 
 The mac configuration may need some additional changes depending on the current
 SDK version being targeted by Chrome; the following change was made for 10.9:
 /* #undef HAVE_FACCESSAT */
 
-TODO(dalecurtis): Seem if there's a CFLAG that can be given to configure to
-avoid it using 10.10 features while Chrome targets 10.9 SDK.
+TODO(dalecurtis): See if there's a CFLAG that can be given to configure to avoid
+it using 10.10 features while Chrome targets 10.9 SDK.