dladd/cm — comment on commit 7904c6adf05f229f1aa3fdd69c2288f4d7421868
File:  line 0
By adamreeve:

I think the easiest way would be to checkout ExampleMakefile from your master branch and then make another commit. So something like:
git checkout master -- ExampleMakefile
git commit -m "Reset example makefile to state in master branch"

The changes I made were to move most of the contents of ExampleMakefile into utils/MakefileCommon.inc, because building the Python bindings requires a lot of the stuff that was in ExampleMakefile. If there are other changes you made they will probably need to go into MakefileCommon.inc.

You could redo the merge but that would be a bit trickier. You'd have to checkout the commit before the merge (maybe make a temporary branch) and redo it, this time keeping the example makefile from the master branch and adding any changes to MakefileCommon.inc. Then reset your nse branch to point to the new merge commit.