caprica/rebase.txt

Created May 15, 2022 09:26

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

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

Download ZIP

git rebase preference when resolving conflicts

Raw

	git rebase -Xtheirs master
	git rebase -Xours master

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