How to replace a commit with another one in Git rebase?

You could do a rebase interactive:

git checkout new_feature
git rebase --interactive old_feature

and drop B1: you simply delete the line with B1:

# If you remove a line here THAT COMMIT WILL BE LOST