Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Deleted user
Level
0 / 0 points
Next:
badges earned
Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.
Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

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

Sign up for free Log in
Atlassian Community Hero Image Collage

How to prevent certain files from being automerged?

Martin Belley-Charbonneau
Martin Belley-Charbonneau Mar 05, 2020

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?

Answer
Watch
Like Gonchik Tsymzhitov likes this
102 views

1 answer

0 votes
Gonchik Tsymzhitov
Gonchik Tsymzhitov Community Leader Jan 08, 2021

I did no find, only custom solution

Reply

Suggest an answer

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

Calling any interview participants for Bitbucket Data Center

Hi everyone,  We are looking to learn more about development teams’ workflows and pain points, especially around DevOps, integrations, administration, scale, security, and the related challeng...

505 views 6 4
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