emailrhoads/Rebase master russian doll strategy

Created April 19, 2021 14:44

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

Select an option

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

Download ZIP

Rebase and prefer master changes #git

Raw

Rebase master russian doll strategy

	`git rebase -X ours master # Short option`

	ours will take the changes from master where conflicts occur

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