title: Git repo sync error: branch XYZ is published (but not merged) and is now 1 commits behind
body: <p>I had submitted two patchsets for a change, the first with "git commit -s", and the
  subsequent with git commit --amend -s". After the review of second patchset, was asked to
  make some more modifications for an improvement. The overall  change/patch itself is
  pending approval, and has not yet been merged.</p>
  
  <p>I made the modificatione needed, and did “git add” on 6 (6 files had changed since the
  last patchset) of the total 7 files that are part of the change, and did a "git commit --
  amend -s". I did a "repo sync", no errors, but did not "repo upload" yet.</p>
  
  <p>Then I remembered that one of the files had been set incorrectly with non-default values 
  for two debug flags in the above commit. So I went back and changed that one file again,
  then did an “git add” of that one file, and a “git commit --amend -s”, which went through
  withour errors, just like the earlier “git add” and “git commit --amend -s” above.</p>
  
  <p>When I did a repo sync again prior to doing the repo upload, I got the following error:</p>
  
  <p>"error: : branch topic1 is published (but not merged) and is now 1
  commits behind"</p>
  
  <p>What is the best/easiest way to fix this and do the repo upload?</p>
  
  <p>thanks in advance.</p>