Comments on: catch up before checking in http://silkandspinach.net/2005/06/02/catch-up-before-checking-in/ development, by example Tue, 07 Feb 2012 05:40:29 +0000 hourly 1 http://wordpress.com/ By: Kevin Rutherford http://silkandspinach.net/2005/06/02/catch-up-before-checking-in/#comment-157 Tue, 07 Jun 2005 10:15:53 +0000 http://silkandspinach.wordpress.com/2005/06/02/catch-up-before-checking-in/#comment-157 You’re right, of course. I would like to assume that build-and-test is really quick, so that there’s little chance of someone else getting in ahead of us, but I know that’s just too optimistic. Maybe the team should have a check-in token (we’ve used a fluffy dinosaur in the past) – whoever has the token is in that final update-build-test phase and no-one else can interrupt it…?

]]> By: Some dude http://silkandspinach.net/2005/06/02/catch-up-before-checking-in/#comment-156 Mon, 06 Jun 2005 20:26:37 +0000 http://silkandspinach.wordpress.com/2005/06/02/catch-up-before-checking-in/#comment-156

“merge from the integration stream into your workspace before every check-in, then re-build and re-test, and only then check in.”

Before that final check-in shouldn’t you re-merge just to check nothing changed whilst you were doing your build and tests?

]]>