chore: merge main → canary (resolve README conflict for #73 promote)#74
chore: merge main → canary (resolve README conflict for #73 promote)#74
Conversation
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| airc msg "<message>" # broadcast to current room | ||
| airc msg @<peer> "<message>" # DM label (still visible to all) | ||
| airc send-file <peer> <path> # send a file (scp with airc identity) | ||
| airc nick <new-name> # rename your identity; paired peers auto-update | ||
| airc nick <new-name> # rename your identity; paired peers auto-update |
There was a problem hiding this comment.
The Core Commands block now mixes aligned and unaligned spacing (e.g., airc send-file and the Identity commands use different padding before # than the surrounding lines). Consider standardizing formatting across the whole code block (either align all command comments or keep single-spacing) to avoid a visually inconsistent README and noisy future diffs.
| airc join <gist-id> # join via shared gist (cross-account fallback) | ||
| airc join <mnemonic> # join via humanhash like oregon-uncle-bravo-eleven | ||
| airc join # auto-scope to your project's room (or resume prior pairing) | ||
| airc join --room <name> # join (or host) a non-general room |
There was a problem hiding this comment.
airc join --room <name> is described as joining a “non-general room”, but with auto-scope the default room often isn’t #general. Rephrase to something like “join a specific room explicitly” (or explicitly reference #general if that’s what you mean) so the guidance stays accurate.
| airc join --room <name> # join (or host) a non-general room | |
| airc join --room <name> # join (or host) a specific room explicitly |
| airc join # auto-scope to your project's room (or resume prior pairing) | ||
| airc join --room <name> # join (or host) a non-general room | ||
| airc join <gist-id> # join via shared gist (cross-account fallback) | ||
| airc join <mnemonic> # join via humanhash like oregon-uncle-bravo-eleven | ||
|
|
||
| airc list # list open rooms on your gh | ||
| airc part # leave current room (host: deletes gist) | ||
| airc list # list open rooms on your gh | ||
| airc part # leave current room (host: deletes gist) |
There was a problem hiding this comment.
PR description says this is a one-line wording conflict resolution, but this hunk also reformats multiple lines (spacing/alignment) in the Core Commands code block. If the reformatting isn’t intentional, consider minimizing to the conflict line to keep the merge/promotion diff small.
Summary
Resolves the conflict blocking PR #73 (canary → main). Pulls main into canary so the promote-PR can fast-forward cleanly.
Conflict resolution
One file —
README.mdCore Commands block. Theairc joincomment had drifted slightly:Took the canary wording (matches the auto-scope feature shipped in #66 and the skill clarity from #67).
Test plan
test/integration.sh— 126/126 still pass