I'm working on updating fldigi to build better in the Fedora MinGW environment and I have commit access to the git repo (at least access to create my own branches).
I have a branch called "tmp/mingw" and I've made several commits. I know other commits had been made to master and I've done this in many other instances but in this case it's causing a "bad merge":
(commit current working state)
$ git commit -am "Initial commit for MinGW 64bit build fixes."
$ git push tmp/mingw
(master is a few commits head of my branch)
$ git merge master
(Merge commit is added to my branch)
$ git push
$ git push
Password:
Enumerating objects: 31, done.
Counting objects: 100% (31/31), done.
Delta compression using up to 12 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.40 KiB | 1.40 MiB/s, done.
Total 11 (delta 10), reused 0 (delta 0), pack-reused 0
remote: -Info- Update is fast-forward
remote: -Info- The user is: 'hobbes1069'
remote: -Info- Found matching head pattern: 'refs/heads/tmp/.*'
remote: -Info- Checking user: 'hobbes1069' against pattern: '.*'
remote: -Grant- Allowing user: 'hobbes1069' with pattern: '.*'
remote: -Grant- Granting access based on ./info/allowed-users
remote:
remote: *** Your commits contain a bad merge:
remote: *** 47456e93 2020-06-10 Merge branch 'master' into tmp/mingw*** Please rebase on top of this commit in tmp/mingw:
remote: *** a596a086 2020-06-10 Initial commit for MinGW 64bit builds.
remote: error: hook declined to update refs/heads/tmp/mingw
To ssh://git.code.sf.net/p/fldigi/fldigi
! [remote rejected] tmp/mingw -> tmp/mingw (hook declined)
error: failed to push some refs to 'ssh://hobbes1069@xxxxxxxxxxxxxxx/p/fldigi/fldigi'
Password:
Enumerating objects: 31, done.
Counting objects: 100% (31/31), done.
Delta compression using up to 12 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.40 KiB | 1.40 MiB/s, done.
Total 11 (delta 10), reused 0 (delta 0), pack-reused 0
remote: -Info- Update is fast-forward
remote: -Info- The user is: 'hobbes1069'
remote: -Info- Found matching head pattern: 'refs/heads/tmp/.*'
remote: -Info- Checking user: 'hobbes1069' against pattern: '.*'
remote: -Grant- Allowing user: 'hobbes1069' with pattern: '.*'
remote: -Grant- Granting access based on ./info/allowed-users
remote:
remote: *** Your commits contain a bad merge:
remote: *** 47456e93 2020-06-10 Merge branch 'master' into tmp/mingw*** Please rebase on top of this commit in tmp/mingw:
remote: *** a596a086 2020-06-10 Initial commit for MinGW 64bit builds.
remote: error: hook declined to update refs/heads/tmp/mingw
To ssh://git.code.sf.net/p/fldigi/fldigi
! [remote rejected] tmp/mingw -> tmp/mingw (hook declined)
error: failed to push some refs to 'ssh://hobbes1069@xxxxxxxxxxxxxxx/p/fldigi/fldigi'
Every time I think I "get" git, I find out I really don't...
Interestingly when I first tried to push my branch I had to use:
$ git push origin HEAD:tmp/mingw
just using:
$ git push origin tmp/mingw
Didn't work. Is this a sourceforge git quirk?
Help!
Thanks,
Richard
_______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
