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?
When conflicts occur during a merge, the git merge --abort command can be used to stop the merge process and revert the repository to its state before the merge began.
Merge Conflicts: Occur when changes from different branches cannot be automatically reconciled.
Abort Merge: git merge --abort undoes the merge process and restores the pre-merge state of the repository.
Option D is correct as it correctly uses the git merge --abort command to revert to the pre-merge state.
Chosen Answer:
This is a voting comment (?). You can switch to a simple comment. It is better to Upvote an existing comment if you don't have anything to add.
Submit