How to add repository specific merge strategy

Henri Kivinen

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.

 

 

 

 

Ana Retamal

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