  to the app(s) specified and any dependencies needed (the table at the other end
  of a ``ForeignKey``, for example).
  
  .. django-admin-option:: --empty
  
  The ``--empty`` option will cause ``makemigrations`` to output an empty
  migration for the specified apps, for manual editing. This option is only
  for advanced users and should not be used unless you are familiar with
 
</s> remove             questioner = MigrationQuestioner()
 </s> add             questioner = MigrationQuestioner(defaults={'ask_merge': True}) </s> remove     @override_system_checks([])
    @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"})
    def test_makemigrations_merge_basic(self):
        """
        Makes sure that makemigrations doesn't error if you ask for
        merge mode with a conflict present. Doesn't test writing of the merge
        file, as that requires temp directories.
        """
        try:
            call_command("makemigrations", merge=True, verbosity=0)
        except CommandError:
            self.fail("Makemigrations errored in merge mode with conflicts")

 </s> add  </s> remove         Makes sure that makemigrations properly merges the conflicting migrations.
 </s> add         Makes sure that makemigrations properly merges the conflicting migrations with --noinput. </s> remove         call_command("makemigrations", "migrations", merge=True, stdout=stdout)
 </s> add         call_command("makemigrations", "migrations", merge=True, interactive=False, stdout=stdout)
The :djadminopt:`--noinput` option may be provided to suppress all user prompts.

  to the app(s) specified and any dependencies needed (the table at the other end
  of a ``ForeignKey``, for example).
  
The :djadminopt:`--noinput` option may be provided to suppress all user prompts.

  .. django-admin-option:: --empty
  
  The ``--empty`` option will cause ``makemigrations`` to output an empty
  migration for the specified apps, for manual editing. This option is only
  for advanced users and should not be used unless you are familiar with
keep keep add keep keep keep keep keep
 Fixed #22862 -- Added --noinput option to makemigrations.

Thanks artortenburger for the report. 
docs/ref/django-admin.txt