latest 20 messages by whaththef

+ [2017-07-01T12:45:37Z] whaththef I don't mean github but GIT itself as a development tool
+ [2017-07-01T12:45:04Z] whaththef thank you sonOfRa and goddamn this git shit, shall the makers burn in hell
+ [2017-07-01T12:42:17Z] whaththef plzzzzzzzzzzzzzzzz
+ [2017-07-01T12:41:31Z] whaththef how to reset everything and just pull from master
+ [2017-07-01T12:41:02Z] whaththef CONFLICT (content): Merge conflict in static/css/app.css Auto-merging index.html CONFLICT (content): Merge conflict in index.html
+ [2017-07-01T12:40:54Z] whaththef Automatic merge failed; fix conflicts and then commit the result.
+ [2017-07-01T12:39:53Z] whaththef thanks sonOfRa
+ [2017-07-01T12:39:39Z] whaththef with the difference that now I don't have very important files in my live server and I'm losing money
+ [2017-07-01T12:39:17Z] whaththef Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>'
+ [2017-07-01T12:39:08Z] whaththef and now git pull says the same thing
+ [2017-07-01T12:38:59Z] whaththef then did git clean -f
+ [2017-07-01T12:38:22Z] whaththef git checkout .error: path 'index.html' is unmerged error: path app.css' is unmerged
+ [2017-07-01T12:26:46Z] whaththef is there a way to ignore whatever he has done and be able to pull again?
+ [2017-07-01T12:26:04Z] whaththef a mentally challenged individual has messed with my repository and now I can't do git pull origin master
+ [2017-07-01T12:25:54Z] whaththef Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>'