          parser.add_argument('--empty', action='store_true', dest='empty', default=False,
              help="Create an empty migration.")
  
      def handle(self, *app_labels, **options):
  
          self.verbosity = options.get('verbosity')
 
</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             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 
        parser.add_argument('--noinput', action='store_false', dest='interactive', default=True,
            help='Tells Django to NOT prompt the user for input of any kind.')
          parser.add_argument('--empty', action='store_true', dest='empty', default=False,
              help="Create an empty migration.")
        parser.add_argument('--noinput', action='store_false', dest='interactive', default=True,
            help='Tells Django to NOT prompt the user for input of any kind.')
  
      def handle(self, *app_labels, **options):
  
          self.verbosity = options.get('verbosity')
keep add keep keep keep keep
 Fixed #22862 -- Added --noinput option to makemigrations.

Thanks artortenburger for the report. 
django/core/management/commands/makemigrations.py