Question

Two engineers work on the same network automation repo. Engineer A commits a change to inventory/hosts.yaml on the feature branch adding a new leaf switch under the 'access' group. Engineer B, on main, edited the same 'access' group block to change the SNMP community. When you run 'git merge main' into the feature branch, Git reports a conflict in inventory/hosts.yaml. Opening the file you see conflict markers surrounding the 'access' group with both sets of changes. What is the correct way to complete the merge so both changes are preserved?

Accepted Answer

Manually edit the file to include both the new leaf switch and the updated SNMP community, remove the conflict markers, then 'git add inventory/hosts.yaml' and commit the merge.

Answer

Run 'git checkout --theirs inventory/hosts.yaml' then 'git add' and commit, since main is authoritative.

Answer

Run 'git merge --abort' and instead use 'git rebase --skip' to bypass the conflicting commit entirely.

Answer

Run 'git checkout --ours inventory/hosts.yaml' then 'git add' and commit, since the feature branch has the newest work.