johnpancoast

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

johnpancoast

Basic RESTful API with Symfony 2 + FOSRestBundle (JSON format only) + FOSUserBundle + FOSOauthServerBundle

The API we are creating in this gist will follow these rules :

• The API only returns JSON responses
• All API routes require authentication
• Authentication is handled via OAuth2 with password Grant Type only (no need for Authorization pages and such).
• API versioning is managed via a subdomain (e.g. v1.api.example.com)

The API will be written in PHP with the Symfony 2 framework. The following SF2 bundles are used :

johnpancoast

#!/bin/bash

version=1.0.1
versionDate="2014-02-14"

function showHelp() {
echo "watchfile - monitor file(s)/command and perform action when changed

Possible ways of usage
----------------------------------------

johnpancoast

<?php
namespace MyApplication\Controller;
 
use Hydrogen\Controller;
use Hydrogen\MultiTemplateRenderer;
 
class Error extends Controller
{
    use MultiTemplateRenderer;