megclaypool

Git Commit Best Practices

Basic Rules

Commit Related Changes

A commit should be a wrapper for related changes. For example, fixing two different bugs should produce two separate commits. Small commits make it easier for other developers to understand the changes and roll them back if something went wrong. With tools like the staging area and the ability to stage only parts of a file, Git makes it easy to create very granular commits.

Commit Often

Committing often keeps your commits small and, again, helps you commit only related changes. Moreover, it allows you to share your code more frequently with others. That way it‘s easier for everyone to integrate changes regularly and avoid having merge conflicts. Having large commits and sharing them infrequently, in contrast, makes it hard to solve conflicts.

megclaypool

<?php

function _load_header_image($variables) {
  if ($node = $variables['node']) {
    // Load main_image
    $file = $node->field_main_image->entity;
    if ($file) {
      $variables = array(
        'responsive_image_style_id' => 'header_image',
        'uri' => $file->getFileUri(),

megclaypool

The Shared Repository Model

$ git clone [email protected]:berkeley-food-recommendations/data-gathering.git

You're cloning the main repository - be careful! We're going to enforce a "no committing to master directly" rule, so no committing directly to master, please.

Short Version

megclaypool

<?php  
 /**
   * @Given /^The element "(?P<selector>[^"]*)" should have a css property "(?P<property>[^"]*)" with a value of "(?P<value>[^"]*)"$/
   *
   * @TODO Need to find a way to test for css styles on elements.
   * Or possibly we should just be checking the markup, and not the styling... Research this more.
   */
  public function assertElementHasCssValue($selector, $property, $value)
  {
    $page = $this->getSession()->getPage();

megclaypool

1. Clone your fork:

git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream

megclaypool

// Use Gists to store code you would like to remember later on
console.log(window); // log the "window" object to the console