Hi
I'm doing exactly as mythtv is: using a git branch for a version of the project, These branches will never be merged. Yet I do not understand why my stuff does not work. Is anybody a guru in this area please?
(Of course the obvious pull does not change this issue)
jam@farlap:~/SD/dvrutils> git push
To ssh://sandypit/~/dvrUtils
! [rejected] HD2 -> HD2 (non-fast-forward)
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://git@sandypit/~/dvrUtils'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
(stackoverflow invited me to not ask this sort of question :-)
James
_______________________________________________
mythtv-users mailing list
mythtv-users@mythtv.org
http://lists.mythtv.org/mailman/listinfo/mythtv-users
http://wiki.mythtv.org/Mailing_List_etiquette
MythTV Forums: https://forum.mythtv.org
I'm doing exactly as mythtv is: using a git branch for a version of the project, These branches will never be merged. Yet I do not understand why my stuff does not work. Is anybody a guru in this area please?
(Of course the obvious pull does not change this issue)
jam@farlap:~/SD/dvrutils> git push
To ssh://sandypit/~/dvrUtils
! [rejected] HD2 -> HD2 (non-fast-forward)
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://git@sandypit/~/dvrUtils'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
(stackoverflow invited me to not ask this sort of question :-)
James
_______________________________________________
mythtv-users mailing list
mythtv-users@mythtv.org
http://lists.mythtv.org/mailman/listinfo/mythtv-users
http://wiki.mythtv.org/Mailing_List_etiquette
MythTV Forums: https://forum.mythtv.org