Mohit Thakral mohitt

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)

Never touch your local /etc/hosts file in OS X again

To setup your computer to work with *.test domains, e.g. project.test, awesome.test and so on, without having to add to your hosts file each time.

Requirements

Homebrew
Mountain Lion -> High Sierra

Install

Grunt and Cordova 3

The advantages of using Grunt with Cordova:

It simplifies working with the cordova cli.
It provides a mechanism to copy platform customization to the platforms directory without having to commit the generated plugins and platforms directories to version control.
It provides a way to watch resources and automatically run cordova commands.

Stack Overflow: .gitignore for PhoneGap/Cordova 3.0 projects - what should I commit?

	CREATE DATABASE IF NOT EXISTS ##DBNAME##;

	GRANT ALL on ##DBNAME##.* to '##DBUSER##'@'%' identified by '##DBPASSWORD##';

	GRANT ALL on ##DBNAME##.* to '##DBUSER##'@'localhost' identified by '##DBPASSWORD##';

	USE ##DBNAME##;