xnull/Git rebase without conflicts

Created September 25, 2018 18:24

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

Download ZIP

Raw

Git rebase without conflicts

https://gist.github.com/n00neimp0rtant/9515611

PavelZaytsev commented Feb 29, 2020 •

edited

Loading

git push --force <- If git complains about fatal: The current branch $BRANCHNAME has no upstream branch. Do git push --set-upstream origin $BRANCHNAME.
Instead do: git push --set-upstream origin $BRANCHNAME --force.

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