Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Complete procedure -
- openstack@os-dev:~/LOAD/tempest$ git review -d Ie707569f6948b0af0d5f7f861ea4c538fbba0060
- Creating a git remote called "gerrit" that maps to:
- ssh://raiesmh08@review.openstack.org:29418/openstack/tempest.git
- Downloading refs/changes/72/45372/4 from gerrit
- Switched to branch "review/mh_raies/port-negative-test"
- openstack@os-dev:~/LOAD/tempest$ git review -d I6ab258ce8a14ad0a16befbbdb06d7abab62ad004
- Downloading refs/changes/30/45230/3 from gerrit
- Switched to branch "review/mh_raies/adding-support-for-network-load-balancer"
- openstack@os-dev:~/LOAD/tempest$ git rebase -i review/mh_raies/port-negative-test
- error: could not apply 6aa512d... Bulk Subnets and Ports creation
- When you have resolved this problem run "git rebase --continue".
- If you would prefer to skip this patch, instead run "git rebase --skip".
- To check out the original branch and stop rebasing run "git rebase --abort".
- Could not apply 6aa512d... Bulk Subnets and Ports creation
- openstack@os-dev:~/LOAD/tempest$
- during rebase file opened to save --
- pick 6aa512d Bulk Subnets and Ports creation
- pick 064da73 Network load balancer testing
- # Rebase 72ca0b1..064da73 onto 72ca0b1
- #
- # Commands:
- # p, pick = use commit
- # r, reword = use commit, but edit the commit message
- # e, edit = use commit, but stop for amending
- # s, squash = use commit, but meld into previous commit
- # f, fixup = like "squash", but discard this commit's log message
- # x, exec = run command (the rest of the line) using shell
- #
- # If you remove a line here THAT COMMIT WILL BE LOST.
- # However, if you remove everything, the rebase will be aborted.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement