I was originally working in 'newfeature' branch and I was called to fix a bug on the live branch urgently. I created a branch for that called 'generalmaintenance', did the job and then switched to develop and merged it in. I now want to return to 'newfeature' branch and to merge in the changes that I merged into it earlier.

When I switched to 'newfeature' and merged in 'develop', there were conflicts in 3 files.

I got in a tangle resolving the conflicts and eventually decided to use the "Revert" command in the 'Team' menu of Aptana Studio 3 (which is my IDE). I expected this to roll me back to before the merge, which it appears to have done.

Anyway, when I merge in 'develop' again, it says, `Already-up-to-date`, but when comparing files between the two branches, they are very different and the changes I added in the other branch are not being merged in.

How will I merge the two branches now please?