On 03/02/2011 01:17 PM, Neal Becker wrote: > How do I debug this? > > git push > To ssh://nbecker@xxxxxxxxxxxxxxxxxxxxxx/mercurial > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to > 'ssh://nbecker@xxxxxxxxxxxxxxxxxxxxxx/mercurial' > To prevent you from losing history, non-fast-forward updates were rejected > Merge the remote changes (e.g. 'git pull') before pushing again. See the > 'Note about fast-forwards' section of 'git push --help' for details. > I am pretty sure you didn't fetch/pull before push. F15 mass rebuild caused new commits. You'll need to do: git fetch git rebase origin/master # fix rebase conflicts git add *spec git rebase --continue git push -- Stanislav Ochotnicky <sochotnicky@xxxxxxxxxx> Associate Software Engineer - Base Operating Systems Brno PGP: 7B087241 Red Hat Inc. http://cz.redhat.com
Attachment:
signature.asc
Description: OpenPGP digital signature
-- devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/devel
