Select Page

Version control

For version control we generally use Git but no matter what system, there are similar things to keep in mind.

Commit messages

Good commit messages serve at least three important purposes:

  • To speed up the reviewing process.
  • To help us write a good release note.
  • To help manage changes in the future, in five years time find out why a particular change was made to the code or why a specific feature was added.

Structure your commit message like this:

From: http://git-scm.com/book/ch5-2.html

Short (50 chars or less) summary of changes

More detailed explanatory text, if necessary.  Wrap it to about 72
characters or so.  In some contexts, the first line is treated as the
subject of an email and the rest of the text as the body.  The blank
line separating the summary from the body is critical (unless you omit
the body entirely); tools like rebase can get confused if you run the
two together.

Further paragraphs come after blank lines.

 - Bullet points are okay, too

 - Typically a hyphen or asterisk is used for the bullet, preceded by a
   single space, with blank lines in between, but conventions vary here

Do

  • Write the summary line and description of what you have done in the imperative mode, that is as if you were commanding someone. Write “fix”, “add”, “change” instead of “fixed”, “added”, “changed” as this reads well during the build process
  • Always leave the second line blank.
  • Line break the commit message (to make the commit message readable without having to scroll horizontally in gitk).

Don’t

  • Don’t end the summary line with a period – it’s a title and titles don’t end with a period.

Tips

  • If it seems difficult to summarize what your commit does, it may be because it includes several logical changes or bug fixes, and are better split up into several commits using git add -p.

Branching and Merging

  • Projects should only have hosted environment branches
    • env/dev
    • env/stage
    • env/production
  • Apart from environment branches, only branch locally
  • Pull requests should be used to merge code
  • Only make pull requests on env/dev
  • No one merges their own code
  • Hooks should complete the migration of code from dev -> stage
  • Production merges are completed manually

References

The following blog post has a nice discussion of commit messages:

“On commit messages”:http://who-t.blogspot.com/2009/12/on-commit-messages.html