How do you resolve a merge conflict in Git?

  • git merge --abort
  • git resolve
  • git commit -m "Merge Conflict"
  • git merge --continue
When a merge conflict occurs in Git, the correct option is to use git merge --abort to abort the merge process and return to the pre-merge state. This option discards the current merge and lets you start over.
Add your answer
Loading...

Leave a comment

Your email address will not be published. Required fields are marked *