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.