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
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?
It looks like you're new here. Sign in or register to get started.
