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

How to prevent certain files from being automerged?

Automatic Merge Conflict are causing us a bit of trouble. We have files containing per-branch information that must stay different between releases branch and master. On each merge, Bitbucket try to merge the version file and fails, causing an automatic merge conflict.

We tried:

  • Putting the file in .gitignore
  •  .gitattributes merge=ours

But Bitbucket doesn't seem to take them into account. Before developing a Plugin, is there a way to prevent this?

1 answer

0 votes

I did no find, only custom solution

Suggest an answer

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

⭐ Calling all Bitbucket and DevOps experts: Special showcase opportunity ⭐

Hi, Bitbucket community! Are you a DevOps practitioner (or know one in your network)? Do you have DevOps tips, tricks, or learnings you'd like to share with the community? If so, we'd love to hea...

1,477 views 4 7
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