Hi,
Here's an error with git I don't know how to resolve.

[paulm at ivy petsc]$ git push 
https://pmullowney at bitbucket.org/pmullowney/petsc-aijcusparse-icc.git        
                                                       
Password:
To https://pmullowney at bitbucket.org/pmullowney/petsc-aijcusparse-icc.git
  ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 
'https://pmullowney at 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

Reply via email to