Comment by Schwern on Git merge does not take all files from source branch

@Crashh No, if you reset you'll lose all the work after the revert. Instead you'll have to do an interactive rebase to remove both the merge and the revert, and then Git will rewrite subsequent commits on top of commit 3. Since the merge and revert cancel each other out, this should be safe, but be sure to --rebase-merges to preserve any valid merges into develop.