I'm using source tree with a mercurial repository. If I make a merge and decide against before I've commited it, how do I roll back to the exact state I was in before I hit the merge button.
Reverting seems to change all the file contents back to a previous version but then wants to commit all those changes as a new version.
I've been working round this by binning the repo and cloneing it again but surely there must be to just abandon uncommited changes?
Hit 'Revert' on the toolbar, but then click on the 'Reset All' tab and use that. This will reset the merge metadata too.
The reason you need this is that your merge action might in fact be to make no actual change, but to still record that you'd merged the two lines of development. Reset All undoes everything.
Found an interesting issue with this: If you have discarded your files individually, or have actually had no files changed, the 'Discard' (I'm in Windows) button in the toolbar is disabled so there's no way to abort without falling back to CLI or Phil's custom action below. It seems the UI is a bit of confused about what 'Discard' is - whether it's about files or your branch state. The discard action on a file or file set is files only, the toolbar popup dialogue is about files or branch state, but the toolbar button's availability is about files only.
I am on 1.7.3 and there is no "Reset All" tab that I can find when in the midst of conflict resolution. Given that one must "revert" all the files, and then a separate action, this seems a very non-intuitive way to abandon an merge, when all I really want to do is "git merge --abort".
To this end, I've created a Custom Action that does a "git merge --abort" which seems to do what I want. It might be useful to others, while we wait for a proper button in the app :)
as @Phil Miesle mentioned you have to have to define a script or, much easier, goto
Tools > Options > Custom Commands > Add
so you have it in access by right click context menu anywhere in the history tree.
But to resume: SourceTree has no native support to abort a merge clean up to and including current latest 2.0.5 client on Mac.
The Discard > All action as mentioned by @Steve Streeting will discard all local, staged and unstaged changes too because it uses a reset --hard command and is irreversible to your uncommitted changes (if there are some unconflicting ones, else the merge will abort earlier itself)!!!
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events