Developing Applications Using Cisco Core Platforms and APIs (DEVCOR) — Question 382

A developer has created an enhancement on a core application feature. During the development changes have been made to a branch named ‘abcde-1a2b3c4d5ee1a2bb-c3’. Conflicts occur when the developer tries to merge the branch to production and so the pre-merge state must now be recreated. Which Git command must be used?

Answer options

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

Correct answer: B

Explanation

The command 'git merge --abort' is used to stop the merge process and return to the pre-merge state when conflicts occur. The other options do not serve this purpose; 'git merge --commit' finalizes the merge, 'git merge --no-edit' performs a merge without editing the commit message, and 'git merge --revert' is used to reverse a previous merge, not to abort the current one.