This is esoteric but easy to resolve: start your new branch where you fix the merge commit with a revert of the revert of the merge commit.
Thanks for the tip Dag!
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
This is esoteric but easy to resolve: start your new branch where you fix the merge commit with a revert of the revert of the merge commit.
Thanks for the tip Dag!