git branch help?

[Neal Becker]

OK, got mercurial updated for devel, apparantly OK.  Now try to update f13:

 fedpkg switch-branch f13
Branch f13 set up to track remote branch f13/master from origin.

[nbecker at nbecker1 mercurial]$ git merge master
Updating f6a7cf0..33f33a6
Fast-forward
 .gitignore     |    2 ++
 mercurial.spec |   10 ++++++++--
 sources        |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

[nbecker at nbecker1 mercurial]$ fedpkg build
Traceback (most recent call last):
  File "/usr/bin/fedpkg", line 959, in <module>
    args.command(args)
  File "/usr/bin/fedpkg", line 319, in build
    url, chain)
  File "/usr/lib/python2.6/site-packages/pyfedpkg/__init__.py", line 797, in 
build
    raise FedpkgError('There are unpushed changes in your repo')
pyfedpkg.FedpkgError: There are unpushed changes in your repo

[nbecker at nbecker1 mercurial]$ git status
# On branch f13
# Your branch is ahead of 'origin/f13/master' by 31 commits.
#
nothing to commit (working directory clean)

[nbecker at nbecker1 mercurial]$ fedpkg commit -p
# On branch f13
# Your branch is ahead of 'origin/f13/master' by 31 commits.
#
nothing to commit (working directory clean)
Could not commit: Command '['git', 'commit', '-a']' returned non-zero exit 
status 1

[nbecker at nbecker1 mercurial]$ git push
To ssh://nbecker@pkgs.fedoraproject.org/mercurial
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 
'ssh://nbecker@pkgs.fedoraproject.org/mercurial'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

OK, I give up.