+ [2015-06-13T22:17:13Z] milki i know nothing about intellij's git interaction
+ [2015-06-13T22:28:55Z] javahorn i should commit where? once it says
+ [2015-06-13T22:29:33Z] javahorn Automatic merge failed; fix conflicts and then commit the result.
+ [2015-06-13T22:32:50Z] gambl0re how do i make a second github page?

message no. 98138

Posted by tuskkk___ in #github at 2015-06-13T16:58:04Z

I had downloaded this repo as zip, https://github.com/spark-mooc/mooc-setup , now I did a git init there and set origin, but on doing a git pull origin master, I get error: Untracked working tree file 'README.md' would be overwritten by merge.
+ [2015-06-14T01:55:24Z] BlueProtoman I have a simple Jekyll plugin (a sprintf formatting filter) I'd like to see about getting added to GitHub page's Jekyll distribution. How can I see about getting it in? Do I just make a pull request, or...?
+ [2015-06-14T01:56:35Z] BlueProtoman (Here it is, by the way) https://github.com/JesseTG/jekyll-format
+ [2015-06-15T08:29:10Z] dmiles_afk i have two directories contraining the same files.. they have slightly differnt histories.. can i somehow manage to merge te two sets of histries?
+ [2015-06-15T08:29:27Z] dmiles_afk like maybe order by the date?
+ [2015-06-15T08:30:05Z] dmiles_afk at this very moment the files are identical.. so at least they'd end up the same