[Swan-dev] heads up 'foxtrot' merges being blocked

Andrew Cagney andrew.cagney at gmail.com
Fri Aug 14 17:15:57 UTC 2020


This finally follows up last years F2F.  I've added a pre-receive hook
to reject foxtrot merges.
See https://blog.developer.atlassian.com/stop-foxtrots-now/

you'll get something like this:

[cagney at bernard wip-logging]$ git push
...
Total 7 (delta 5), reused 0 (delta 0), pack-reused 0
remote: *** PUSH REJECTED! FOXTROT MERGE BLOCKED!!!
remote: *** See: https://blog.developer.atlassian.com/stop-foxtrots-now/
remote: *** to fix, try: git rebase
To ssh://vault.libreswan.org/srv/src/libreswan.git
 ! [remote rejected]       main -> main (pre-receive hook declined)
error: failed to push some refs to
'ssh://vault.libreswan.org/srv/src/libreswan.git'

and yes "git rebase" does seem to fix it.


More information about the Swan-dev mailing list