?

Log in

No account? Create an account

Previous Entry | Next Entry

*unenthusiastic* Wee. =|

weather: clear
outside: 6°C
mood: brain oozing out

I just finished a monstrous source code merge. 800 Megs, 7700 files. Resolving merge conflicts is probably the most draining task ever.

It literally takes all day (8+ hours) to merge - if I make a mistake somewhere in the middle, it'll take me two working days to finish. To merge any more frequently than once a week would mean having one person be a Full Time Merge Donkey. They don't pay us enough to do that.

The client is also split into two teams, one in Ottawa, ON (3 hours ahead of us) and one in Dallas, TX (1 hour ahead). So, including us, all three teams are doing parallel development and we touch the same areas of code.

For the non-technical folks, you DON'T EVER DO THIS unless you are severely possessed. By a kumquat.

Today is legally the last day of the contract. I'll still be doing documentation until November 15th. *sigh*


Comments

( 6 comments — Leave a comment )
incognita
Oct. 31st, 2002 07:44 pm (UTC)
DON'T EVER DO THIS unless you are severely possessed. By a kumquat.

That made me giggle hysterically. I hope your tomorrow is better than today :)
sertrel
Oct. 31st, 2002 09:10 pm (UTC)
Oh good, I'm glad I'm not the only one who finds the thought of a kumquat spirit possession amusing. :)
(Deleted comment)
sedition
Nov. 1st, 2002 09:28 am (UTC)
Really? I'd think that fruit posession would be kind of a non-event. I mean what do they do except sit around all day and.. well... be fruit...

Then again. It's the perfect job description for the "Merge Monkey" so I guess that kinda works..
bride
Nov. 1st, 2002 09:37 am (UTC)
I mean what do they do except sit around all day and.. well... be fruit...

That's exactly what I meant. You'd have to be pretty stupid to set up a project where three remote teams are touching the same code.
( 6 comments — Leave a comment )

Profile

eLouai
bride
The Bride of the First House

Latest Month

March 2015
S M T W T F S
1234567
891011121314
15161718192021
22232425262728
293031