-
Stan Hu authored
When there are merge conflicts, a rebase will always fail. Since the `cannot_be_merged` state is cached, we can use that to tell the user that the rebase will not go through until the conflicts are resolved.
836a562a
When there are merge conflicts, a rebase will always fail. Since the `cannot_be_merged` state is cached, we can use that to tell the user that the rebase will not go through until the conflicts are resolved.