+ [2015-11-13T21:20:24Z] TynkaTopi my changes, I dont want commit my changes, I want that new version
+ [2015-11-13T21:21:00Z] Zarthus Well it's giving you multiple solutions, as did I. What's wrong?
+ [2015-11-13T21:21:15Z] TynkaTopi I'll try stash
+ [2015-11-13T22:15:17Z] TynkaTopi something went wrong, now master has those stash marks

message no. 119905

Posted by TynkaTopi in #github at 2015-11-13T21:18:31Z

it throws an error: error: Your local changes to the following files would be overwritten by merge:
+ [2015-11-14T02:55:52Z] ryantrinkle is it possible to add a different organization's team as a collaborator?
+ [2015-11-14T16:06:56Z] hillpim hi, I'm trying to set up a blog on github with jekyll but am getting an error. Could someone help with this?
+ [2015-11-14T16:07:04Z] Remram Am I the only one who didn't get his Hacktoberfest tee-shirt yet? :(
+ [2015-11-14T16:07:19Z] Remram hillpim: what is the error?
+ [2015-11-14T16:08:24Z] hillpim The file `css/main.scss` contains syntax errors