22 March 2007

Commit early, Commit often.

We're nearly the end of one build phase. And a lot of people are committing their changes into version control. For each person that commits before you, you have to merge their changes into yours first before you can commit yours. Hence, the wisdom in the header.

Yesterday was one excruciating day of merging more than 40 files into my working branch. The auto-merge messed up a few things too that I wasn't aware of, further compounding the problem of "it builds, it just doesn't want to run".

I was glad and in good mood by the end of the day though. Possibly because I nailed the problem at the end.