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.
Loading...
Related Quiz
- A developer wants to automate the deployment of their application to a server after each commit to the master branch on GitLab. Which Git feature should they utilize?
- What is the purpose of cherry-picking in Git?
- A developer wants to temporarily save changes without committing them to maintain a clean project history. What Git feature should they use?
- Which Git command is used to download a repository from a remote server?
- A team wants to ensure that no commit messages are pushed without a specific ticket number format. Which Git Hook should they configure?