[Bash-completion-devel] git issue...

[Guillaume Rousse]

For an unkwnown reason, git keep trying to push changes both in my local
branches 'master' and '1.x', and fails for this last one:

[guillaume at oberkampf bash-completion (master)]$ git push -v
Pushing to
git+ssh://guillomovitch-guest@git.debian.org/git/bash-completion/bash-completion.git
To
git+ssh://guillomovitch-guest@git.debian.org/git/bash-completion/bash-completion.git
 = [up to date]      master -> master
 ! [rejected]        1.x -> 1.x (non-fast-forward)
updating local tracking ref 'refs/remotes/origin/master'
error: failed to push some refs to
'git+ssh://guillomovitch-guest@git.debian.org/git/bash-completion/bash-completion.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'non-fast-forward'
section of 'git push --help' for details.

I'm up-to-date for all branches:

[guillaume at oberkampf bash-completion (master)]$ git pull -v