Community
Q&A
Bitbucket
Questions
Official way to resolve conflict leads to foxtrot merge

Official way to resolve conflict leads to foxtrot merge

Hello,

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

checkout your source branch
git pull origin master
git commit
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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like • ZeroComfort likes this

Was this helpful?

Thanks!

Bitbucket

Forums

Q&A

Community resources

Support

Top groups

Community resources

Support

Learn

Community resources

Support

Events

Community resources

Support

Official way to resolve conflict leads to foxtrot merge

1 answer

Comments for this post are closed

Was this helpful?

Thanks!

TAGS

Atlassian Community Events