I'm a dyed-in-the-wool XP'er, so I prefer continuous integration, which involves merging code every few hours.