jayers99/gitFun.sh

Last active April 10, 2019 00:54

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/jayers99/2a13a9d362a20ba54dd5a497c6a606f5.js"></script>
Save jayers99/2a13a9d362a20ba54dd5a497c6a606f5 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

	# reset my local to my origin
	git fetch --all
	git reset --hard origin/<branch>

	# auto rebase conflicts
	git rebase -X ours upstream/master

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