Using SourceTree I have just performed a cherry pick and I got a merge issue. I have used my merge tool to result the issue. I now have uncommited changes on the top of my current trunk. How do I resume and complete the cherrypick?
Community moderators have prevented the ability to post new answers.
Press the commit button to commit the merge results. The necessary files should already be staged for you.
When I do this, the usual cherry pick commit message seems to get lost and I have a blank commit message. Not sure if I am doing something wrong.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Correct answer seems to be use the terminal to run git cherry-pick --continue. SRCTREE-3133 seems to cover this.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.