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

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,466,234
Community Members
 
Community Events
176
Community Groups

Avoid conflict for version file while using Automatic branch merging functionalities

Edited

Hi,

We want to use the "Automatic branch merging" for that we enabled the  "Enable automatic branch merging" as mentioned at the page Automatic branch merging.

Version: Atlassian Bitbucket v7.21.2

Now let's assume we have two branches release/6.1 and release/6.2  and both have version file. so each time there a PR merge in release/6.1 code should auto merge to release/6.1.

But when we have different version let's say

release/6.1   

Direct Commit 1> version file content "6.1.1"

release/6.2   

Direct Commit 1> version file content "6.2.1"

Now made few change in release/6.1 and made a PR-1 from other branch  --> release/6.1

When I am merging this PR-1 it is displaying message that it will merge to release/6.2. But when we hit the button merge instead of merging to release/6.2 it always raise conflict PR-2 from release/6.1-->release/6.2  for version file.

We tried this suggestion

Followed:

  • Login to your Bitbucket server via terminal.
  • Execute git config --global merge.ours.driver true

And added below in .gitattribute

version merge=ours

Faced the same issue.

Is there a way to avoid version file conflict as we don't want to merge version file from release/6.1 --> release/6.2?  

 

1 answer

Could anyone reply on it?

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events