Stuff Michael Meeks is doing
|
|
This is my (in)activity log. You might like to visit my employer
Novell which is an amazing company, and also
Dell who in days of yore provided me with a
free laptop for Gnome development / conferences.
Also if you have the time to read this sort of stuff you could enlighten
yourself by going to Unraveling Wittgenstein's net or if
you are feeling objectionable perhaps here.
Older items:
2009: (
J
F
),
2008: (
J
F
M
A
M
J
J
A
S
O
N
D
),
2007: (
J
F
M
A
M
J
J
A
S
O
N
D
),
2006,
2005,
2004,
2003,
2002,
2001,
2000,
1999,
legacy html
-
Up lateish; breakfast, . Pushed
misc. Evo pieces. Spent an hour merging, and re-merging
branches with git - with tens of highly dumb, irritating
conflicts, all of my own creation. Apparently
git
merge is not what you want to do, particularly several
times. Seemingly git pull --rebased - which is
marked as dangerous and bad in the man page is what you want.
This brings back the darkest days of trying to track and
update a large, long running cvs branch: but worse.
Incompetant git use: no doubt.
-
How can it be, that a
git pull --rebase
would want to apply the same changeset twice ? apparently
nonsensical but after skipping a number of such sillies, the
diff to the original merge tag evaporated: near victory.
Annoyingly Matthew's identical merge went with, apparently
no problems, amazing. Dinner, bed.
In case it's not painfully obvious: the reflections reflected here are my
own; mine, all mine ! and don't reflect the views of Novell, The
Lithuanian Gov't or Arnold Schwarzenegger. It's also important to
realise that I'm not in on the Swedish Conspiracy.
Occasionally people ask for formal photos for conferences,
bio.
or fun.
Michael Meeks (michael.meeks@novell.com)
