Skip to content

Instantly share code, notes, and snippets.

@szydan
Last active November 15, 2023 22:43
Show Gist options
  • Save szydan/82c86998d83d31e7ea32aec3fb212fdf to your computer and use it in GitHub Desktop.
Save szydan/82c86998d83d31e7ea32aec3fb212fdf to your computer and use it in GitHub Desktop.
A note about rebase
git checkout master
git pull
git checkout issue-106
git rebase master
# here in case of any conflict fix it
# do git add path/to/fixed/file
git rebase —continue
git push -f origin issue-106
Rebase onto already rebased branch
Below find the "fork" sha (one on your branch INVE-22284 before you made your first commit)
git rebase --onto branch-bfs-import 30f9c02c38fd63f65af7e2e22b654e958e4c7ee2 INVE-22284
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment