From 1aada25eeb8debabe5e1a50d64843b085a95237b Mon Sep 17 00:00:00 2001 From: Seonghyeon Cho Date: Sat, 9 Oct 2021 23:53:27 +0900 Subject: [PATCH] [4.0.x] Refs #32900 -- Restored '[y/N]' in questioner prompt when merging migrations. Regression in 02bc7161ec477afd4a7b328936eb8adac078d7b9. Backport of aa0d796e37c4b8056148de2f68726aae9d20399c from main --- django/db/migrations/questioner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py index 3891616ce01..31973a11b6c 100644 --- a/django/db/migrations/questioner.py +++ b/django/db/migrations/questioner.py @@ -205,7 +205,7 @@ class InteractiveMigrationQuestioner(MigrationQuestioner): return self._boolean_input( "\nMerging will only work if the operations printed above do not conflict\n" + "with each other (working on different fields or models)\n" + - 'Should these migration branches be merged?', + 'Should these migration branches be merged? [y/N]', False, )