We are using Stash as our SCM. Currently we are a team of three (developer1,developer2,developer3). Developer1 is working on branch1 of a stash repository. He has pushed some changes on branch1 which I am also working.I want to pull the branch1 data from remote server to my working copy.
But pull got aborted because I have my local changes via 'source tree tool'. How can I keep my local changes and pull the data from remote server without overwriting it? I want to push the local changes to remote afterwards as latest commit.
I was using SVN before. In SVN If my working copy have the old commit, svn client will prompt me to update my working copy and subsequently ask me to merge my changes if there is need. I need similar feature now.