title: How to revert changes I made with merging two branches
body: <p>I have two branches <code>develop</code> and <code>personal</code>. I use <code>GitExtensions</code> tool. I was working in <code>develop</code> branch and then I needed to merge it with <code>personal</code>. I launched merging, the tool notified me there are some conflicts (different name of packages) and proposed to resolve conflicts using <code>mergetool</code>. But <code>mergetool</code> wasn't opened as usual but I got the message all conflict resolved, I was expecting to resolve them manually. Of course this accidentally (?) happened merging was incorrect and I tried to revert these changes by <code>Reset current branch to here</code> and chosen my previous commit. Unfortunately changes made were reverted (which is ok) but <strong>name of folders</strong> (my packages in android platform) didn't. I tried to revert changes by <code>checkout</code> and <code>reset</code> but I can't get the snapshot of file system when everything was ok. I'm very new to <code>git</code>, please advice how to resolve this problem.</p>