Control Freak blocks fox-trot merge but it seems to be making an assumption

[Steven Whitman]

Recently I’ve had to of our developers report that their merges were block because they would be a fox-trot merge. Both developers had merged the destination branch out to their branch (ugh) and then wanted to merge back to the destination. I believe that control freak may be making an assumption. The error message they got indicated that if someone pushed a new commit to the destination branch then they would be able to merge. I believe that the fox-trot would only occur if they do a fast forward merge. If they actually created a new merge commit then I believe this would also avoid the fox-trot merge.

It is my belief that control freak is being safe because the user could select a fast-forward merge but I was wondering if it would be possible to allow the merge by only enabling the merge (no-ff) option which would always create the commit and avoid the fox-trot. Since a repo might disallow such a merge this would either need to be configurable or would need to test if that merge strategy is allowed.

[Steven Whitman]

Hi, just curious if my understanding of how control freak is working is correct and also if it is possible to change the behavior based on the merge option.

‌