Mike Little’s not-quite-so-daily thoughts, babblings, and random synapse firings!
A collection of random thoughts and links. Nothing too exciting. ;-) -- Mike Little
[powered by WordPress.]
I’ve spent all day merging code streams together today. It’s been quite painful because I’ve not been able to use CVS’s automatic merging, and had to do it all by hand. Basically, half the stuff on one branch has already been merged, and now they want the other half, except for one change. But I think I’ve got it all done now. I just need to test it thoroughly.
The URI to TrackBack this entry is: http://zed1.com/journalized/archives/2003/01/30/merge-mania/trackback/
Please note: Comment moderation is currently enabled so there will be a delay between when you post your comment and when it shows up. Patience is a virtue; there’s no need to re-submit your comment.
[powered by WordPress.]
counter:
13518225
Akismet has protected Mike Little's Journalized from 1,944,477 spam comments.
jour·nal n. A personal record of occurrences, experiences, and reflections kept on a regular basis; a diary.
| M | T | W | T | F | S | S |
|---|---|---|---|---|---|---|
| « Dec | Feb » | |||||
| 1 | 2 | 3 | 4 | 5 | ||
| 6 | 7 | 8 | 9 | 10 | 11 | 12 |
| 13 | 14 | 15 | 16 | 17 | 18 | 19 |
| 20 | 21 | 22 | 23 | 24 | 25 | 26 |
| 27 | 28 | 29 | 30 | 31 | ||

95. We are waking up and linking to each other. We are watching. But we are not waiting.
— The Cluetrain Manifesto


44 queries. 0.921 seconds