Undo a fast-forward merge

If you reset the branch master, it won’t touch develop branch. In order to reput all in order, you should do:

git checkout master
git reset --hard sha-of-B
git checkout develop
git reset --hard sha-of-D
git checkout master
git merge develop --no-ff