Developer is working on a new feature and made changes on a branch named 'branch-413667549a-new'. When merging the branch to production, conflicts occurred. Whi...

Developer is working on a new feature and made changes on a branch named 'branch-413667549a-new'. When merging the branch to production, conflicts occurred. Which Git command must the developer use to recreate the pre-merge state?

A. git merge --no-edit B. git merge --commit C. git merge --revert D. git merge --abort