300-435 Question 7
Select 3You are part of a DevOps team managing a Cisco SD-WAN automation project. Your team is using Git for version control. A colleague has pushed a new feature branch to the remote repository, and you need to integrate it into the main branch. However, when performing the merge, a conflict occurs with a file named 'policy.yaml'. Which of the following steps should you take to resolve the conflict and complete the merge successfully?
- A
Open the 'policy.yaml' file, manually resolve the conflict, and then stage the resolved file using 'git add policy.yaml'.
- B
Run 'git merge --skip' to bypass the conflicted file and complete the merge.
- C
Use 'git diff' to review the changes that caused the conflict in 'policy.yaml'.
- D
After resolving the conflict, run 'git commit' to finalize the merge.
- E
Run 'git clone' to create a fresh copy of the repository and retry the merge.
Show answer and explanation
Correct answers: A, C, D
Explanation
When a merge conflict occurs in Git, you must manually resolve the conflict by editing the affected files, use 'git add' to stage the resolved files, and then run 'git commit' to complete the merge. 'git diff' helps you review the conflicting changes. Other commands like 'git merge --skip' or cloning the repository are not appropriate for resolving conflicts.
- A. Correct.
Correct: Resolving the conflict manually and staging the resolved file with 'git add' is a necessary step to indicate that the conflict has been handled.
- B. Incorrect.
Incorrect: 'git merge --skip' is used to skip the conflicted commit entirely, which is not recommended when resolving merge conflicts as it ignores the changes.
- C. Correct.
Correct: 'git diff' is useful for reviewing the differences that caused the conflict, helping you understand how to resolve it properly.
- D. Correct.
Correct: After resolving the conflict and staging the changes, you must run 'git commit' to finalize the merge process.
- E. Incorrect.
Incorrect: Cloning the repository again does not address the conflict and is unnecessary. The conflict must be handled directly within the current repository.