Philipp Nowak literalplus

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)

	// Released under the BSD License.
	// Kristian S. Stangeland 2013.

	package com.comphenix.example;

	import java.util.ArrayList;
	import java.util.List;

	import org.bukkit.Server;
	import org.bukkit.entity.Player;

	<!DOCTYPE html>

	<!-- Helpful things to keep in your <head/>
	// Brian Blakely, 360i
	// http://twitter.com/brianblakely/
	-->
	<head>

	<!-- Disable automatic DNS prefetching.