New questions....
A developer is working on an enhancement for an application feature and has made changes to a branch called ~devcor-432436127a-enhance4~. 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 -abort
C. git merge -revert
D. git merge "comrmt