Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git pull --ff-only fail #1

Open
zqfan opened this issue May 26, 2016 · 0 comments
Open

git pull --ff-only fail #1

zqfan opened this issue May 26, 2016 · 0 comments

Comments

@zqfan
Copy link
Owner

zqfan commented May 26, 2016

Traceback (most recent call last):
File "/usr/local/bin/gitall", line 11, in
sys.exit(main())
File "/usr/local/lib/python2.7/dist-packages/gitall/gitall.py", line 34, in main
git.cmd.Git(dest_dir).pull(ff_only=True)
File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 459, in
return lambda _args, *_kwargs: self._call_process(name, _args, *_kwargs)
File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 920, in _call_process
return self.execute(make_call(), **_kwargs)
File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 705, in execute
raise GitCommandError(command, status, stderr_value)
git.exc.GitCommandError: 'git pull --ff-only' returned with exit code 1
stderr: 'From https://github.com/openstack/charm-nova-cloud-controller
854e3e7..30c6031 master -> origin/master
error: 'refs/remotes/origin/stable' exists; cannot create 'refs/remotes/origin/stable/16.04'
! [new branch] stable/16.04 -> origin/stable/16.04 (unable to update local ref)
error: some local refs could not be updated; try running
'git remote prune origin' to remove any old, conflicting branches'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant