celian-m/Git.sh

Last active January 3, 2018 15:13

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/celian-m/d821f14f4200f3fe6dab901039263a52.js"></script>
Save celian-m/d821f14f4200f3fe6dab901039263a52 to your computer and use it in GitHub Desktop.

Download ZIP

Git commands

Raw

Git.sh

	#Merge using strategie
	git checkout --ours ( --theirs ) filename

	#Restart merge
	git checkout -m FILE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment