+[2015-06-13T22:17:13Z]milkii know nothing about intellij's git interaction +[2015-06-13T22:28:41Z]javahornok milki +[2015-06-13T22:28:55Z]javahorni should commit where? once it says +[2015-06-13T22:29:33Z]javahornAutomatic merge failed; fix conflicts and then commit the result. +[2015-06-13T22:32:50Z]gambl0rehow do i make a second github page?
message no. 98167
Posted by milki in #github at 2015-06-13T22:17:13Z
i know nothing about intellij's git interaction
+[2015-06-14T01:55:24Z]BlueProtomanI 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_afki 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_afklike maybe order by the date? +[2015-06-15T08:30:05Z]dmiles_afkat this very moment the files are identical.. so at least they'd end up the same