Hello! We're using Bitbucket Server v5.8.0 and trying to achieve some special workflow: for our `/dist` directory with compiled files (needed in git repo for some reason) we want the conflicts never to occur. Means that any conflict within `dist` directory should be resolved with (for example) `ours` strategy in all the PRs. So far we've done: * added `.gitattributes` file to all of the branches with content `dist/ merge=ours` (tried `dist/**/* merge=ours` too) * executed `git config --global merge.ours.driver true` on a developer's machine and on Bitbucket Server machine under BB service user both – and so far this works on local machine when merging a branch to master, but doesn't seem to work in Bitbucket Server during the PR merge checks Please help us fight these conflicts :) Thanks! Regards, Evgeniy

We have the same problem. We want to use a custom merge driver to easily merge Maven poms with different version numbers using the fantastic pomutils (see (*1)). And it works - but Bitbucket claims in the pull request that there is a conflict. Than, when you look at the diff, there is no differences because of the merge driver. Please Atlassian - fix this! (*1) https://github.com/cecom/pomutils

nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Custom merge strategies for specific folders via .gitattributes

Semenov Evgeniy

Hello!

We're using Bitbucket Server v5.8.0 and trying to achieve some special workflow: for our `/dist` directory with compiled files (needed in git repo for some reason) we want the conflicts never to occur. Means that any conflict within `dist` directory should be resolved with (for example) `ours` strategy in all the PRs.

So far we've done:

added `.gitattributes` file to all of the branches with content `dist/ merge=ours` (tried `dist/**/* merge=ours` too)
executed `git config --global merge.ours.driver true` on a developer's machine and on Bitbucket Server machine under BB service user both

– and so far this works on local machine when merging a branch to master, but doesn't seem to work in Bitbucket Server during the PR merge checks

Please help us fight these conflicts

Thanks!

Regards,
Evgeniy

Accepted answers

All comments

Baskar Annamalai

Hi Evgeniy,

Can I know if you've attempted to resolve the conflict as suggested in https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html

Regards,

Aaron Hooper

I believe you have misunderstood the question. Using a customer merge driver, what they accomplished by running `git config --global merge.ours.driver true ` and adding to the gitattributes file, should allow the merge conflict to resolve itself by allowing using the "ours" version automatically. The question is why is Bitbucket ignoring the .gitconfig settings during pull requests?

Semenov Evgeniy

Exactly!

hesam al

Any update on this issue ?

I want to be able to by pass pull request conflict ( GUI ) if the merge strategy is set to ours on the specific file. Thanks.

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

server

bitbucket

bitbucket-server