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

[Paul Wouters]

On Fri, 14 Aug 2020, Andrew Cagney wrote:

> 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

Thanks! When I've done them they were always accidents....

Paul