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
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

25,556 views 26 12
Join discussion

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