The problem

You are about to commit in the invoices repo, on main. You edited 3 files this morning and ran git add on one of them. Before you commit, you want to see exactly which lines will go in and which will stay behind. After that, Lea asks what her branch feature/pdf would bring into main.

git status --short prints M app/billing.py (staged), M app/tax.py and M README.md (not staged). In app/tax.py you changed REDUCED = Decimal("0.055") to Decimal("0.10"). In README.md you changed python -m app to python3 -m app. Lea’s branch feature/pdf adds app/pdf.py. Since she started it, main got one more commit, Add the reduced VAT rate, which adds 2 lines to app/tax.py.