Re: How do I revert a my fork back to nim devel?

[solo989]

this is the exact error message when I try git checkout devel

error: you need to resolve your current index first

lib/pure/pegs.nim: needs merge

this is one of my commits that has now been been overridden in devel how do I 
resolve/remove it?