On taking pull from develop to my feature branch if there are any conflicts, my branch detaches.

[Sonali Palvankar]

On taking pull from develop to my feature branch if there are any conflicts, my branch detaches from sourcetree. There is no way to take latest develop branch code in my branch. Tried changing the public and private key but no luck. Please help.

[Tinker Fadoua]

Welcome to the Atlassian Community @Sonali Palvankar !

I only came across your question today. I know you posted it some time ago.

Please let me know if you are facing any issues.