Stuff Michael Meeks is doing |
Older items: 2023: ( J F M A M J ), 2022: ( J F M A M J J A S O N D ), 2021, 2019, 2018, 2017, 2016, 2015, 2014, 2013, 2012, 2011, 2010, 2009, 2009, 2008, 2007, 2006, 2005, 2004, 2003, 2002, 2001, 2000, 1999, legacy html
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.
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.
My content in this blog and associated images / data under
images/ and data/ directories are (usually)
created by me and (unless obviously labelled otherwise) are licensed under
the public domain, and/or if that doesn't float your boat a CC0
license. I encourage linking back (of course) to help people decide for
themselves, in context, in the battle for ideas, and I love fixes /
improvements / corrections by private mail.
In case it's not painfully obvious: the reflections reflected here are my own; mine, all mine ! and don't reflect the views of Collabora, SUSE, Novell, The Document Foundation, Spaghetti Hurlers (International), or anyone else. It's also important to realise that I'm not in on the Swedish Conspiracy. Occasionally people ask for formal photos for conferences or fun.
Michael Meeks (michael.meeks@collabora.com)