feat!: remove deprecated `--resolve-conflicts`#1193

kellyselden wants to merge 1 commit intomasterember-cli/ember-cli-update:masterfrom

remove_resolve-conflictsember-cli/ember-cli-update:remove_resolve-conflictsCopy head branch name to clipboard