L12 · Integrate through a pull request and conflict review
Skill packs and prompts are provided in English so they work best with the AI tools. Use them as-is.
Integrate Through a Pull Request and Conflict Review
Learning time: about 34.0–50.1 active minutes. Choose ONE presentation: the text (about 5.1 minutes, estimated) OR the lesson video (3:57, measured). Then 30–45 minutes of practice and checking (estimated). Do not count both presentations. Setup delays and optional extra study are separate; learner timing has not yet been piloted.
Where you are: Module 6, lesson 12. You have two separate changes. Now decide what belongs in the shared project and verify the combined result.
What you will do
Prepare a pull request in your own private practice repository, review the exact changes, resolve a supplied conflict exercise and distinguish review, merge and publication.
Teaching
A pull request proposes that one branch's changes be incorporated into another. It gives the project owner a place to inspect the difference and discuss it. It is not itself evidence that a change is correct. Nor does opening one mean that the work has merged.
Before creating it, inspect the branch, current commit and changed files. Check that the destination is your private practice repository, not a workplace production repository. Compare the remote destination with the project record. If that record is missing, resolve it before pushing.
A local commit is not on GitHub until pushed. The following command pushes the named exercise branch and records its upstream; use it only after confirming that origin is the intended remote and this is your authorized practice work:
git push -u origin practice-guide
If you used another branch name, substitute the actual name. Do not use force. In GitHub, open a pull request from that branch to the practice repository's intended base. Confirm both branch selectors. Write what changed, why, how it was checked and what remains unresolved. A request that says only “done” gives the reviewer very little to assess.
Review should name the exact revision. A comment about yesterday's file may not apply after today's repair. Inspect the change itself and its surrounding behavior. When an assistant reports a problem, ask for the triggering input, expected result and actual evidence. Then repair the real issue and rerun affected checks. Merely agreeing with the assistant is not verification.
Merge only after the owner of the practice repository accepts the reviewed change. Your course exercise can merge into that practice repository; it does not authorize changes to any production system. Publication remains a separate decision. A repository can also have automation triggered by a push or merge, so check its workflow before treating those actions as consequence-free.
Worked example
Yusuf reviews the new usage guide. It says users can submit workshop bookings. The actual artifact is only a local planning calculator. He requests a correction and checks the replacement sentence. He then reviews the limitations note before combining it with the guide.
Both branches merge without textual conflicts. Yusuf still opens the calculator and follows the guide from a clean copy. He finds a link that points to the author's old folder and repairs it. A successful merge did not prove successful handover.
Do it yourself
Prepare the guide pull request with this complete review request, delivered to the second assistant:
Review the proposed Workshop Launch Kit guide change in my private practice repository. This is read-only: do not edit, post, approve, merge or publish. Ask for the actual repository, base branch and revision if they are not available; do not guess them. Compare the changed guide with the local artifact and approved brief. Check opening instructions, input units, output meaning and exclusions. Report each finding with evidence and a reproduction step. Separate confirmed defects from questions. Report the exact revision reviewed and any access limitation.
Fill the missing repository/revision information from your project record before sending. Inspect the findings yourself. Use learner/templates/REVIEW-AND-TEST-LOG.csv to retain the result and any repair/retest. Repeat for the limitations branch, then check the combined result after authorized integration.
Now resolve this supplied text conflict, without changing your real working files:
<<<<<<< guide-branch
The tool accepts workshop bookings and payments.
=======
The tool is a local planning calculator; it does not accept bookings or payments.
>>>>>>> limits-branch
The approved brief excludes booking and payment features. Write the final sentence and explain your choice. Do not select a side merely because its branch is newer.
Feedback and retry
Pause here before reading.
The retained sentence must describe a local planning calculator and exclude bookings/payments. Remove all conflict markers in the resolved version. Confirm that no other sentence still implies those features. Your reason comes from the approved requirement and actual artifact, not branch priority.
For a retry, both branches now say “local planning calculator,” but one says the price is USD30 and the other USD35. The approved input remains USD30. Keep the approved value unless the owner explicitly changes the requirement, then test every dependent calculation. A clean merge can still contain this disagreement.
If GitHub access is unavailable, prepare the complete change proposal and review locally and label the remote pull request pending. This completes the reasoning exercise, not the live remote-integration requirement. Finish that demonstration when access is restored.
Check your understanding
Choose an answer and write one sentence explaining why before you read the answers.
- An AI reviewer finds no issues. Can you report that the project is published?
- A. No: review, approval, merge and publication are different actions with separate evidence.
- B. Yes: a clean review completes the project.
- C. Yes, once the pull request is open.
Answers
- A. No. Review, approval, merge and publication are different actions with separate evidence. No finding also does not prove that every requirement was tested.
Summary
Integrate a specific reviewed revision, then test the combined result. Keep the owner decision and any remaining limitation visible in the handoff.
Sources
- GitHub flow.
- Pull request reviews.
- Merge conflicts.
- Codex review scope.
- Checked 8 November 2026. Yusuf's scenario and conflict text are original teaching examples.
