Final: ship the release

Branch, push for review, pull a teammate's change, resolve a conflict, merge, tag v1.0.0.

Your work meets the team's

Your live search is ready — but while you worked, a teammate changed the same config line. Push your branch for review, bring main up to date, resolve the conflict on purpose, then merge, push and tag the release.

The release workflow

git switch -c live-search      # your work, on a branch
# …edit, add, commit…
git push -u origin live-search # open a pull request
git switch main
git pull                       # get the team's latest
git merge live-search          # CONFLICT in src/api.ts?
# edit the file to the right final content
git add src/api.ts
git commit -m "Merge live search"
git push
git branch -d live-search
git tag v1.0.0

Your work meets the team's

The release workflow

The rest of this lesson