Re: git push fails

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Mar 02, 2011 at 07:17:16AM -0500, 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.
> 

http://pkgs.fedoraproject.org/gitweb/?p=mercurial.git

If I had to guess, you don't have that top commit in your tree.

Just run git pull or git merge origin/master to merge your changes with
the commit from Dennis, and you should be able to push.

Fedora disallows you to trample over other peoples commits by pushing a
discontinuity in the history.

--Kyle
-- 
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel


[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Formulas]     [Fedora PHP Devel]     [Kernel Development]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Gimp]     [Yosemite News]
  Powered by Linux