+ [2016-08-13T18:07:29Z] chris_99 ah, alas, cheers. It was just in a todo list i have.
+ [2016-08-13T19:52:57Z] ShekharReddy I forgot to tag the previous release and I accidentally published it to GitHub
+ [2016-08-13T21:40:20Z] Surfer2010_ Hello is there a smart way to use git to control your own system while experiments and developing it
+ [2016-08-13T21:40:56Z] Surfer2010_ So I can fork go back commit and comment changes

message no. 146672

Posted by marcm in #github at 2016-08-13T02:38:07Z

Thank you.
+ [2016-08-14T00:46:50Z] WACOMalt hey folks. I need help resolving a conflict
+ [2016-08-14T00:47:01Z] WACOMalt with a pull request. never done this before but it says I have to use git command line?
+ [2016-08-14T00:47:20Z] WACOMalt so I opened git bash, CD'ed to the right folder of the synced repo, typed git status
+ [2016-08-14T00:47:33Z] WACOMalt but it doesnt show anything like "You have unmerged paths" like this guide says it should show
+ [2016-08-14T00:49:24Z] Zarthus if there's a merge conflict it probably means your fork is out of date with the master branch