justin/ai-workflow-course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use python3 as the canonical command name course-wide (#104) (#105)
CI / check (push) Successful in 7s
Details
Sync course wiki / sync-wiki (push) Successful in 4s
Details

Browse Source
This commit was merged in pull request #105.
This commit is contained in:
Claude (agent)
2026-06-23 20:25:05 -04:00
parent 7f439212ac
commit 95e5911957
102 changed files with 380 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blog/07-branches-sandboxes.md
+9 -9
View File
@@ -79,9 +79,9 @@ Let it edit `tasks.py` and `cli.py` freely. This is a multi-file change: exactly
```bash
git diff # read what it actually changed
python cli.py add "ship module 6" --priority high
python cli.py add "water plants" --priority low
python cli.py list # see if priorities work and sort
python3 cli.py add "ship module 6" --priority high
python3 cli.py add "water plants" --priority low
python3 cli.py list # see if priorities work and sort
git add .
git commit -m "Add task priorities (experiment)"
```
@@ -90,7 +90,7 @@ The payoff: prove the isolation. Switch back to `main` and watch the whole featu
```bash
git switch main
python cli.py list # no priorities: main is exactly as you left it
python3 cli.py list # no priorities: main is exactly as you left it
```
Sit with that for a second. Your bold change exists *only* on the branch. `main` never saw it. That's the entire point of the module in two commands.
@@ -103,7 +103,7 @@ Sit with that for a second. Your bold change exists *only* on the branch. `main`
git switch main
git merge experiment/priorities # likely a fast-forward: main slides up to the branch
git log --oneline --graph # straight line = fast-forward
python cli.py list # the feature is now on main
python3 cli.py list # the feature is now on main
git branch -d experiment/priorities # branch did its job; -d is the safe delete
```
@@ -127,9 +127,9 @@ Most merges just work; Git is genuinely good at combining changes that touch *di
```python
<<<<<<< HEAD
print("usage: python cli.py [add <title> | list | done <index> | purge]")
print("usage: python3 cli.py [add <title> | list | done <index> | purge]")
=======
print("usage: python cli.py [add <title> | list | done <index> | stats]")
print("usage: python3 cli.py [add <title> | list | done <index> | stats]")
>>>>>>> feature/stats
```
@@ -149,8 +149,8 @@ It resolves silently and the merge lands. And here is the only part that's still
```bash
git diff HEAD~1 # what the merge actually changed; confirm no markers, both commands present
python cli.py # run it: see the merged usage string
python cli.py stats && python cli.py purge # both actually work
python3 cli.py # run it: see the merged usage string
python3 cli.py stats && python3 cli.py purge # both actually work
```
That `git diff` after *every* merge is the whole skill now. Not "edit the markers by hand," which the AI did for you before you could blink, but "know a conflict can happen and check the silent resolution," because a resolution that runs cleanly can still be wrong and it won't leave an error behind to warn you. (And if your AI's edits didn't happen to collide (they're nondeterministic), the course ships a little `make-conflict.sh` helper that manufactures one deterministically so you can still see the markers at least once.)