Caleb P. Burns cpburnz

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)

	#!/bin/sh

	# update repositories
	curl -sL https://deb.nodesource.com/setup_10.x \| bash -
	apt-get update

	# download the necessary prerequisite components for mineos
	apt-get -y install -y nodejs git rdiff-backup screen build-essential openjdk-8-jre-headless

	# download the most recent mineos web-ui files from github