Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Official way to resolve conflict leads to foxtrot merge

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?

1 answer

0 votes
Ana Retamal Atlassian Team Oct 14, 2019

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

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.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

New improvements to user management in Bitbucket Cloud 👥

Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...

3,757 views 10 16
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you