Ever had a merge fail with a fatal: git write-tree failed to write a tree
message out of the blue?
It sounds terrifying, but when I got the root cause is quite mundane: file name conflicts in the merging commits that git is not smart enough to figure out without help. And when you fixup your merge, you are left with a commit that's lost one of its parents ("falling off a branch").
If you do much file reorganisation in a project with branches, it turns out this can be quite common (had it a few times on a recent (more...)
Doing more than just talking about viruses: he fires up a few classics in a DOS box and pokes around with a binary editor before looking at current threats and live infection data. Very cool and entertaining. Not many are brave enough to do live demos, but if you watch to the end you'll get to see how prepared he was for failure;-)
Best served with sides of:
If you're like me, you have a bunch of trusty (and rusty) shell scripts that you reach for when doing things like testing a new load balancer.
Enough of that! igp
(It goes PING!) is a simple command line utility for testing services with a range of common protocols: ICMP, UDP, TCP, HTTP/S, LDAP/S and so on.
This is nothing earth shattering I know, but it's nice to have simple cross-platform (since it's ruby) tool that does all the common protocols in one. Thankfully, most of the work has already been done by the net-ping library
- igp really (more...)
in Singapore is over. It was an amazing event (ryan
takes notes so we don't have to - day#1 day#2
Somehow I managed to cheat my way into a line-up of legendary speakers that included Matz himself. Here are the slides..
I spoke about multi-tenancy - what it is and why it's increasingly relevant for Rails development. It dives a little into four of the many approaches and ends with the challenge: Isn't it about time there was a 'Rails Way'?Blogarhythm: So Many Ways POP DISASTER
Thanks to nfarina
for a patch to improve compatibility with older IE versions.. jQuery UI AddToCal widget
is stepped to 0.1.1 and now listed in the jQuery plugin store
To recap .. use AddToCal if you want to offer your website visitors the ability to add any events you list or present on your site to their own calendar. It supports Google Calendar, Microsoft Live Calendar, Yahoo! Calendar, 30boxes, any iCal or vCalendar compatible desktop application (and you can extend it to support any special calendar software you might be dealing with).
See my previous post
that describes how (more...)
So a few weeks ago I found myself wanting "soft-delete" in a Rails app. Ruby Toolbox
is a little long in the tooth on the subject, but after a little more research I discovered xpond's paranoid
project that was just what I wanted:
- packaged as a gem, not a plugin
- built for Rails 3 (arel-aware in particular)
- can be selectively applied to your models
All was cool, except at about the same time we updated to Rails 3.0.3 and it broke (as it turned out, due to changes in AREL 2.0.6 internals).
One of the beautiful (more...)