Official way to resolve conflict leads to foxtrot merge

[MarcinGil]

Hello,

We're following the official way to resolve conflicts on pull requests:

1. checkout your source branch
2. git pull origin master
3. git commit
4. git push origin HEAD

However this leads to the situation where the Control Freak plugin denies merge because it is a foxtrot merge.

https://blog.developer.atlassian.com/stop-foxtrots-now/

How to solve conflicts then and avoid this situation?

[Ana Retamal]

Hi @MarcinGil

Looks like this issue is caused by the plugin Control Freak. As they're developed by a third party, my suggestion would be that you contact them for support, they posted their contact details in the Marketplace, you can find it at Support for Control Freak.

Hope that helps you,

Ana

[Piotr Gliźniewicz]

Control Freak just detects the foxtrot merge. It's the solution, that Bitbucket suggests that causes them and Bitbucket doesn't warn you, that you will butcher your git history if you do it that way.