johnandersen777.bsky.social/knotless
git that lives in your Atmosphere account
Forked from chadtmiller.com/knotless
A maintainer and a teammate working in one repository, with the branch churn of an ordinary week.
alice
You lead a small service, inventory. Create the repository with a README
and app.py holding a function total(items) that sums item prices.
Make a long-lived develop branch from main. Your teammate {carol} will
work in this repository directly, not from a fork: give them what they
need to push branches and merge pulls here.
carol
{alice} has given you access to their inventory repository. On a new
branch off develop, add a function count(items) to app.py and open a
pull into develop. Then add a second commit on the same branch that
documents count in the README, and check the pull now brings in both
commits.
alice
The team has decided to stop using develop and to call it next
instead. Make that so in inventory without losing anything: open pulls
that targeted develop should target next. Check {carol}'s pull still
merges cleanly, then let them know.
carol
{alice} renamed a branch in inventory. Check your pull is pointed where
it should be, then merge it yourself and check the result on its target
branch.