[vonmoltke]

> q: What do you use for source control? a: We use $NAME but we forbid branching because merging is too hard.

Where I used to work, and the first place I wrote software full-time, we were not allowed to commit code to our system (Synergy) until after our code review. I ended up creating a parallel SVN repository so I could do incremental check-ins.

Don't get me started in merging...

[cableshaft]

I don't think we are supposed to either, but it's never been an issue for our company because there's always shelvesets with TFS, so you can shelve your work at different stages and retrieve it later.

If you're using a DVCS like git, though, that seems silly.