DevOps / SRE / Platform Engineer / Stage 3 · Shared changes
Review a change and resolve competing edits
"Already know" meets prerequisites. "Not relevant" removes the topic from your total but leaves what builds on it waiting.
Self-check
- In a disposable repository, two branches change the same line of a configuration file. Merge them, resolve the conflict deliberately, and write the review note a colleague would need to approve it.
- Evidence to include: Keep the conflicting hunks, the resolved file, and a review note that says what changes, why, how to verify it and how to undo it.
Try it without the material first, then compare. Save your answer in your notes below. Report a problem with this self-check
Learning activities
2 activities- Not done3.2 Git Branching - Basic Branching and Merging (opens another site)
Branches, fast-forward and three-way merges, and resolving a conflict by hand.
9 min - Not doneHow to do a code review (opens another site)
Google's published reviewer guidance: start here and follow its six short pages on what to look for and how to comment.
25 min