Skip to content

Prevent rebase from being run in quick action when there are conflicts

Stan Hu requested to merge sh-disable-rebase-on-conflicts into master

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.

Edited by Stan Hu

Merge request reports