I now need to merge those changes back into the production branch
git revert
, if done on the production
branch, would have created a new commit canceling the one you wanted to remove.
Since that new commit is already on that branch ('production
'), you cannot merge it.
If you meant "merge back to feature
branch", then the merge you apply that new commit on the feature
branch, removing the changes from the feature
branch as well.