To your specific question, the exact commands to get my repository back exactly
to devel
git reset --hard devel
git clean -f
Run
but I think what you actually need is to resolve merge conflicts... which is
just edit the files and then `git add <file>` and then `git commit`
You problem is not specific to nim, but general git usage. You have mentioned a
lot of terms, but you have no idea what they are supposed to do. There are a
lot of resources about git on the Internet. I would suggest slowing down your
peace and spent few hours to grab the basic of git. I remember I learn git from
this course at code school long time ago and now it become part of pluralsight
=]
[https://www.pluralsight.com/courses/code-school-git-real](https://www.pluralsight.com/courses/code-school-git-real)
