Closed larsbutler closed 9 years ago
You have it based off some historical HEAD, I cannot pull it correctly now without needless merge. Needs to be rebased once more, probably.
You have it based off some historical HEAD, I cannot pull it correctly now without needless merge. Needs to be rebased once more, probably.
Yeah, you can't git pull
cleanly after a rebase. You can fetch it into a fresh branch, though.
@pkit For example: git fetch https://github.com/larsbutler/zerocloud.git acl-rebased:whatevername
Rebased version of https://github.com/zerovm/zerocloud/pull/157.