search

larsenwork / monoid

Customisable coding font with alternates, ligatures and contextual positioning. Crazy crisp at 12px/9pt. http://larsenwork.com/monoid/
7.86k stars 170 forks source link

Tested in some editors for #67 #82

Closed santosh closed 9 years ago

santosh commented 9 years ago

Started early but I was late in pull request. Hope merge conflict can be resolved.

larsenwork commented 9 years ago

You always need to pull the latest version from my master before sending a pr and preferably rebase so everything is in one commit as per github golden standard:)

I'm afraid this can't be merged :)

santosh commented 9 years ago

Not doing it again! :persevere: Merge conflict could have been resolved manually I think! :expressionless:

plgruener commented 9 years ago

Well, larsenwork has the point, I think. It's git(hub) etiquette that the one who wants his changes to be merged does a nice rebase, so the repo-owner can easily merge (fast-forward) it. After all, we want him to refine Monoid, not resolving merge-conflicts ;-)

(although I understand your rage, the github webpage is not as user-friendly as wished…)

santosh commented 9 years ago

You do it @plgruener! Do the changes I have made.

larsenwork commented 9 years ago

@santosh nope, we can't really see what you want to change as the commit compares it to an outdated version. Sorry:)

larsenwork commented 9 years ago

And please keep unnecessary exclamation marks out of my repo :wink: