Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,294,705
Community Members
 
Community Events
165
Community Groups

Merge strategy in .gitattributes doesn't work on Bitbucket.

I add the rules in .gitattributes as below.

changelog.txt merge=union

It works well on my local. But it didn't work when I create a pull request on the Bitbucket website.

 

I saw there are some same questions on community.   So you don't have implemented this feature yet?

Is there any other way I can try?  Because this file needs to be changed frequently by multiple people, it is very easy to conflict. My team members are annoying it.

1 answer

1 accepted

0 votes
Answer accepted
Caroline R Atlassian Team Aug 16, 2021

Hi, @Jader Yang

Thank you for reaching out to Atlassian Community!

For now, if you merge the code in Bitbucket and there are conflicts, you’ll need to resolve them locally. We don’t have a way to automatically resolve conflicts when merging from the website.

We do have the following feature request to add the ability to automatically resolve merge conflicts:

I would suggest that you add your vote there (by selecting the Vote for this issue link) as the number of votes helps the development team and product managers better understand the demand for new features. 

You are more than welcome to leave any feedback there, and you can also add yourself as a watcher (by selecting the Start watching this issue link) if you'd like to get notified via email on updates.

If you are not familiar with our Feature Request Policy, you can read more about it here.

Also, in case you would like to read more about merge conflicts, you can access the following documentation:

Please, feel free to share any additional questions or concerns regarding this case.

Kind regards,
Caroline

Suggest an answer

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

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

2,159 views 2 9
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