November 12, 2008
Version control thoughts
In the ideal world, your log of version control messages looks like this:
Davy - 11/12/08 - Added blocks functionality to pages, first working version
Tijs - 11/12/08 - Improved blocks functionality to support ordering of content blocks
Bert - 11/12/08 - Improved blocks functionality, each block can have a module attached
Annelies - 11/12/08 - Improved blocks functionality, when you change your template, you will get a warning that all content will be resorted into the new blocks (if the new template has fewer blocks, content will be lost, this is in the warning message)
These are all major changes and worthy of a commit to the trunk. However, once a designer gets in, it starts to look like this:
Davy - 11/12/08 - Added blocks functionality to pages, first working version
Johan - 11/12/08 - Fixed bug with the select box for blocks in IE6
Johan - 11/12/08 - Added in a better icon for the blocks functionality
Johan - 11/12/08 - Improved overall layout the blocks functionality
Johan - 11/12/08 - Added a width to the blocks select box since Opera f*cks up long template names
Tijs - 11/12/08 - Improved blocks functionality to support ordering of content blocks
Johan - 11/12/08 - Improved overall layout the blocks functionality (again)
Johan - 11/12/08 - Improved overall layout the blocks functionality (again, now more spacing)
Johan - 11/12/08 - Added arrows when sorting so you’ll know where the blocks will “land”
Johan - 11/12/08 - Bigger clickable area to “grab” a block
(…)
Design and interaction design aren’t easy to put in words, and they clutter up your version control log like crazy. But then again, I’m lucky our log doesn’t look like this.
Davy - 11/12/08 - (no message)
Johan - 11/12/08 - (no message)
Johan - 11/12/08 - (no message)
Johan - 11/12/08 - (no message)
Johan - 11/12/08 - (no message)
Tijs - 11/12/08 - (no message)
Johan - 11/12/08 - Who the f* committed a non working version!?@1!
Johan - 11/12/08 - (no message)
Johan - 11/12/08 - (no message)
Johan - 11/12/08 - (no message)
Some systems let you combine several commits into one. When you rebase interactively in git, you can do this by what is called sqaushing.
November 13th, 2008 at 6:12 ∞I feel your pain! ^^
November 13th, 2008 at 12:37 ∞