Marcio Puga marciopuga

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)

tmux shortcuts & cheatsheet

start new:

tmux

start new with session name:

tmux new -s myname

	<!DOCTYPE html>
	<html lang="en">
	<head>
	<meta charset="UTF-8">
	<meta http-equiv="X-UA-Compatible" content="IE=edge">
	<meta name="viewport" content="width=device-width, initial-scale=1.0">
	<title>Vanilla Boilerplate / threejs + gsap</title>
	<style>
	html,
	body {

	var EventEmitter = require('events').EventEmitter;
	var _ = require('lodash');

	// Factory shared
	var makePerson = function() {
	var person = {};
	EventEmitter.call(person);
	person.wallet = 0;
	_.extend(person, personMethods)
	return person;