Missed Team ’24? Catch up on announcements here.

×
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
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

How to add repository specific merge strategy

Henri Kivinen
Henri Kivinen
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
Get involved
February 5, 2019

Adding following lines to config-file in repository folder

[merge "ours"]
driver = true

Does not seem to have any effect. The files that have in .gitattributes merge strategy set as "ours" are still causing merge conflicts if edited on 'both sides' of the merge.

When manually creating a repository and adding the lines to .git/config it seems to work fine.

 

 

 

 

Answer
Watch
Like Be the first to like this
354 views

1 answer

0 votes
Ana Retamal
Ana Retamal
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
February 18, 2019

Hi Henri

Have you tried setting the merge strategies on Bitbucket directly, as explained at Pull request merge strategies?

Is there any reason why you prefer to apply them locally?

Let us know!

Ana

Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events