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

3 votes

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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,764 views 1 5
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