Report message to a moderator
From your description everything sounds fine - except that you would not need the fetch step or you could do just a merge instead of a pull.
Which version of EGit do you use? There was a bug when the merge commit turned out to be empty, i.e. having no diff after resolving the conflicts: https://bugs.eclipse.org/bugs/show_bug.cgi?id=385924. It was fixed in August and is available with egit 2.1.