Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

setting git config is not reflecting on bitbucket server

vipuln_ktx
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!
March 11, 2023

Hi,

We are using bitbucket server's auto merge feature.

But in few of our repos, we don't want this to happen for a specific file.

We expect, if the conflict occurs for this file during merge, destination branch version should get used.
Therefore, we have added the a line in .gitattributes file.

<file-name> merge=ours

Additionally as per git documentation, we have to use custom merge driver,
so we ran following command on bitbucket server

git config --global merge.ours.driver true
git config --system merge.ours.driver true

As per this article, since we are unsure about the user with bitbucket server was started
so, we had set the config at global as well as system level.

But for some reason the value is NOT getting reflected. and we are getting conflict error which we do not expect.

Can anyone suggest anything we are missing here?

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events