+[10 years ago]javahorni should commit where? once it says +[10 years ago]javahornAutomatic merge failed; fix conflicts and then commit the result. +[10 years ago]gambl0rehow do i make a second github page? +[10 years ago]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...? +[10 years ago]BlueProtoman(Here it is, by the way) https://github.com/JesseTG/jekyll-format
(Here it is, by the way) https://github.com/JesseTG/jekyll-format
+[10 years ago]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? +[10 years ago]dmiles_afklike maybe order by the date? +[10 years ago]dmiles_afkat this very moment the files are identical.. so at least they'd end up the same +[10 years ago]Seveasdmiles_afk: if they are both git repos, you can add one as a remote to the other and merge it in +[10 years ago]dmiles_afkthats actualyl what i did.. and when i got done i reliazed that there was two pdigrees of the same files