Question

A little background:

master branch of code base

dev branch of code base

both are being worked on (I know, but I just started on this project so I’m not to blame)

at one point, dev was mistakenly merged back into master, then a few commits later all those changes were reverted (manually, it looks like)

Now, I need to merge dev back into master for real, but all the changes that were accidentally merged and then reverted are, of course, missing.

I’m not quite sure what to do here other than manually making the changes after the merge.

Any thoughts?

Answer 1

I would suggest an interactive rebase. Delete the commit that reverted the changes and fix any merge conflicts.