mightydes · August 29, 2015 13:57
diff --git a/.gitignore refresh b/.gitignore refresh
 git rm -r --cached /
diff --git a/Commit to branch b/Commit to branch
 git stash
 git checkout -b other-branch
 git stash pop
diff --git a/Conflicts b/Conflicts
 git diff --name-only --diff-filter=U
diff --git a/Merge strategy b/Merge strategy
 git checkout --ours -- <paths>
 # or
 git checkout --theirs -- <paths>
	git checkout --ours -- <paths>
	# or
	git checkout --theirs -- <paths>