QuestionQ444

Software Development and Design

A developer has created an enhancement to a core application feature. During development, changes were made on a branch named abcde-1a2b3c4d5ee1a2bb-c3. Conflicts occur when the developer attempts to merge the branch into production, so the pre-merge state must be recreated. Which Git command must be used?

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

git merge --abort stops the current conflicted merge and attempts to reconstruct the state that existed before the merge started.

Learn more

Community Discussion

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