rms80

REM grab latest commits from server
git submodule update --recursive --remote

REM above command will set current branch to detached HEAD. set back to master.
git submodule foreach git checkout master

REM now do pull to fast-forward to latest commit
git submodule foreach git pull origin master

karenyyng

Table Of Content

Skip to the relevant sections if needed.

• 2-min tutorial to do it the quick-and-dirty-way
• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
  • Resolving conflict from a Git pull
• Other great references and tutorials

kimmobrunfeldt

// Style 1
// Export all manually

// Good: Calling functions inside the module is convenient
// Bad:  module.exports becomes verbose and it's tedious to add new functions

function a() {
    b()
}

rochacbruno

#!/usr/bin/env python

# Haversine formula example in Python
# Author: Wayne Dyck

import math

def distance(origin, destination):
    lat1, lon1 = origin
    lat2, lon2 = destination