Handling unmergeable files -- a call to arms

[Ian Clatworthy]

Stephen J. Turnbull wrote:

> Well, three, I guess.  There's also
> 
> 3.  Grit your teeth, let the deadline slip, and while you're on the
>     bus invent and implement a merge algorithm for the heretofore
>     unmergeable file. :-)

and ...

4. Grab a mobile phone and call someone at the office (or online) and
   ask them to grab the lock on your behalf.

Ian C.