A colligue of mine merged a feature branch into our main development branch. I did a revert on that commit. Now I want to merge the development branch into the feature branch, but git deletes all the new files in the feature branch.
I guess this is happening because there is a common ancestor, the wrong full commit that got reverted.
How do I merge development into feature branch retaining all the code in the feature branch?
