Looking here: https://bitbucket.org/pmullowney/petsc-aijcusparse-icc/commits/all you're probably better off pushing on branch pm/aijcusparse-icc (or another named branch). If you amended your work (e.g., using 'git rebase -i' or 'git commit --amend') then you would need to use the '--force' option to push. Force pushes are acceptable *only* when nobody depends on your repository/branch, which is the case here. On Mon, Mar 25, 2013 at 10:38 AM, Paul Mullowney <[email protected]> wrote:

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

[paulm@ivy petsc]$ git push https://pmullowney@bitbucket.** org/pmullowney/petsc-**aijcusparse-icc.git<https://[email protected]/pmullowney/petsc-aijcusparse-icc.git> Password: To https://pmullowney@bitbucket.**org/pmullowney/petsc-** aijcusparse-icc.git<https://[email protected]/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<https://[email protected]/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