QuestionQ223

Software Development and Design

A developer on a team of distributed authors is working on code in an isolated Git branch named update1a2b3456789. The developer tries to merge the new code with a branch named dvcapp9a8b7654321, but the merge operation encounters a conflict error. Which Git command must the developer use to leave the merge process and restore the branch to its prior state?

  • A git abort --status
  • B git abort --merge
  • C git merge --exit
  • D git merge --abort
Explanation

git merge --abort cancels the active conflict-resolution process and attempts to reconstruct the state that existed before the merge began.

Learn more

Community Discussion

No comments yet. Be the first to start the discussion!