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:
[guilla...@oberkampf bash-completion (master)]$ git push -v Pushing to git+ssh://[email protected]/git/bash-completion/bash-completion.git To git+ssh://[email protected]/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://[email protected]/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: [guilla...@oberkampf bash-completion (master)]$ git pull -v >From git+ssh://git.debian.org/git/bash-completion/bash-completion = [up to date] 1.x -> origin/1.x = [up to date] changelog-handling -> origin/changelog-handling = [up to date] dev-utils -> origin/dev-utils = [up to date] frozen/1.0 -> origin/frozen/1.0 = [up to date] master -> origin/master Already up-to-date. And my config doesn't says anything about 1.x: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = git+ssh://[email protected]/git/bash-completion/bash-completion.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master What's wrong here (apart myself) ? -- BOFH excuse #197: I'm sorry a pentium won't do, you need an SGI to connect with us. _______________________________________________ Bash-completion-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/bash-completion-devel
