diff options
Diffstat (limited to 'changelogs/unreleased/sh-disable-rebase-on-conflicts.yml')
| -rw-r--r-- | changelogs/unreleased/sh-disable-rebase-on-conflicts.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-disable-rebase-on-conflicts.yml b/changelogs/unreleased/sh-disable-rebase-on-conflicts.yml new file mode 100644 index 00000000000..c0514929d2a --- /dev/null +++ b/changelogs/unreleased/sh-disable-rebase-on-conflicts.yml @@ -0,0 +1,5 @@ +--- +title: Prevent rebase from being run in quick action when there are conflicts +merge_request: 51243 +author: +type: fixed |