Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
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

Join now to unlock these features and more

Changing direction in merge conflict instructions

Sarah Shonberger
Sarah Shonberger Dec 08, 2022

In older version of bitbucket/stash when a merge from master to dev branch was requested there were instructions given to run that would should the developer how to resolve those by hand. The instructions ended up merged on the dev branch.

Now the instructions for the developer end of with a merge on the master branch. Can anyone tell me why or anyway to fix this.  

 

 

Answer
Watch
Like Be the first to like this
147 views

0 answers

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
DEPLOYMENT TYPE
SERVER
TAGS
AUG Leaders

Atlassian Community Events

See all events