API tools faq
paste
Guest User

Untitled

a guest
Nov 18th, 2017
119
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.83 KB | None | 0 0
raw download clone embed print report
  1. ~/.../openshift/origin → git rebase -i master
  2. CONFLICT (modify/delete): pkg/cmd/server/admin/overwrite_bootstrappolicy.go deleted in HEAD and modified in 252b2ab7ba... boring. Version 252b2ab7ba... boring of pkg/cmd/server/admin/overwrite_bootstrappolicy.go left in tree.
  3. CONFLICT (modify/delete): pkg/cmd/server/admin/legacyetcd/rolebinding/policybased/virtual_storage.go deleted in HEAD and modified in 252b2ab7ba... boring. Version 252b2ab7ba... boring of pkg/cmd/server/admin/legacyetcd/rolebinding/policybased/virtual_storage.go left in tree.
  4. CONFLICT (modify/delete): pkg/cmd/server/admin/legacyetcd/role/policybased/virtual_storage.go deleted in HEAD and modified in 252b2ab7ba... boring. Version 252b2ab7ba... boring of pkg/cmd/server/admin/legacyetcd/role/policybased/virtual_storage.go left in tree.
  5. error: could not apply 252b2ab7ba... boring
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!