innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[4.0.x] Refs #32900 -- Restored '[y/N]' in questioner prompt when merging migrations. 

Regression in 02bc7161ec.

Backport of aa0d796e37 from main
This commit is contained in:
Seonghyeon Cho 2021-10-09 23:53:27 +09:00 committed by Mariusz Felisiak
parent fe97f8bb62
commit 1aada25eeb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/questioner.py
View File

@ -205,7 +205,7 @@ class InteractiveMigrationQuestioner(MigrationQuestioner):
return self._boolean_input( return self._boolean_input(
"\nMerging will only work if the operations printed above do not conflict\n" + "\nMerging will only work if the operations printed above do not conflict\n" +
"with each other (working on different fields or models)\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, False,
) )