Hi,

I added two useless files to netman that I want to remove: these are
netman.lpi and netman.lps.

What should I do? git is rejecting my changes like this:
$ git pull
error: Your local changes to the following files would be overwritten by merge:
    netman.lpi
    netman.lps
Please, commit your changes or stash them before you can merge.
Aborting

I want to also delete my latest two git commits to the repository if
that is possible.

Edward