[petsc-dev] git errors when trying to push to a fork.
Paul Mullowney
paulm at txcorp.com
Mon Mar 25 10:38:34 CDT 2013
Hi,
Here's an error with git I don't know how to resolve.
[paulm at ivy petsc]$ git push
https://pmullowney@bitbucket.org/pmullowney/petsc-aijcusparse-icc.git
Password:
To https://pmullowney@bitbucket.org/pmullowney/petsc-aijcusparse-icc.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to
'https://pmullowney@bitbucket.org/pmullowney/petsc-aijcusparse-icc.git'
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.
Should I do:
git pull -u
And then try to push? Presumably, this will pull from my fork and not
'next' or 'master'?
-Paul
More information about the petsc-dev
mailing list