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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

How to use git merge drivers in Bitbucket Cloud?

Good morning,

In our repository we have some files that shall be protected from merge on pull-requests.

In the server version we are using a small script as git merge driver but we don't find a way to do the same in Bitbucket cloud.

Is there any way to add custom merge drivers, or else protect some files from the merge?

Thanks in advance

Best regards

1 answer

1 accepted

0 votes
Answer accepted
Syahrul
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Nov 24, 2022

Hi @Oliver CENTENO 

G'day.

Based on my review, Bitbucket cloud doesn't support 'git merge drivers.' However, we do have an existing feature request that was raised previously at:

Please Vote and Watch the feature request so that you'll receive an update whenever we have any in the future.

Cheers,
Syahrul

Thanks for both answers Syahrul, this request has only 5 votes though, i think it´s not gonna be implemented anytime soon.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events