How to resolve conflicts using stash

Hello while merging code in stash using pull request i am getting resolve conflict issue . please check snap shot . can anyone please suggest how to solve this issue?

Untitled.png

1 answer

You need to resolve it in a local work tree. Click the little triangle warning icon and it will give you the steps to follow.

Thanks jamie for quick reply. i have one more question. can i manually merge the code in stash same like Visual studio?? i want to know whole code review mechanism in stash can you please help me for that?

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Mar 14, 2019 in Bitbucket Pipelines

Building a Bitbucket Pipe as a casual coder

...ipe.sh :  #!/bin/bash source "$(dirname "$0")/common.sh" enable_debug extra_args="" if [[ "${DEBUG}" == "true" ]]; then extra_args="--verbose" fi # mandatory variables R...

258 views 0 12
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you