suggestion for /usr/src/UPDATING
boris at brooknet.com.au
Wed Sep 1 18:38:06 PDT 2004
> On Mon, 30 Aug 2004, Ulrich Spoerlein wrote:
>> On Mon, 30.08.2004 at 09:31:06 -0700, David O'Brien wrote:
>> > > mergemasters is gross. Have you ever tried to run it on an
>> 80-column display?
>> > > I absolutely hate the "left" "right" stuff. You push the "l" with
>> your right
>> > > hand and the "r" with your left for crying out loud.
>> > LOL!!
>> This is not funny. I myself have to think loud about which button to
>> press. 'r' is on the left keyboard side and 'l' is to the right.
> I second the "don't laugh" - you have no idea how many times I have to
> select "redo the merge" when upgrading servers usually during a
> late-night maintenance window, with a brain only functioning due to
> large amounts of caffeine in the bloodstream...
> (Not that I have any suggestions for other keys to use, mind you - but
> the mind's wiring does have a problem with getting used to pressing a
> key with the left hand to select the right side of the screen and
> vice versa...)
I think it would be nice if the 'merge then edit' command merged entire
files at once instead of just parts, cvs conflict style.
More information about the freebsd-current