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

[sschwarzer]

I assume the pull got you stuck in a merge because of a merge conflict. The 
output of `git status` should say something about this. If it's confirmed by 
`git status`, you can either try to resolve the merge conflict by editing the 
file, `git add` it and use `git merge --continue`, or you can stop the merge 
with `git merge --abort` (though I don't know if it works differently with 
merges triggered by a `git pull`), then stash or discard your changes. If you 
stash your changes, you'll get the conflicts again during unstashing them, but 
that's at least "outside" the pull. :)