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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

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.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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?

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Was this helpful?

Thanks!

Bitbucket

Forums

Q&A

Community resources

Support

Top groups

Community resources

Support

Learn

Community resources

Support

Events

Community resources

Support

How to resolve conflicts using stash

1 answer

Comments for this post are closed

Was this helpful?

Thanks!

TAGS

Atlassian Community Events