Skip to content

Practice resolving a decaf menu conflict - #3

Open
charlestang06 wants to merge 2 commits into
mainfrom
cytang/decaf-menu
Open

charlestang06 wants to merge 2 commits into
mainfrom
cytang/decaf-menu

Conversation

@charlestang06

Copy link
Copy Markdown
Collaborator

Adds a decaf americano and explains decaf substitutions in two commits.

Workshop exercise: this branch and the seasonal menu branch add drinks at the same location. After the seasonal PR merges, this PR intentionally needs conflict resolution. Preserve both the maple latte and decaf americano when rebasing onto origin/main or merging main into this branch. Keep this PR open for participants.

Validation: local HTML links and whitespace pass on this branch; integration conflict is intentional.

Copilot AI balanced review requested due to automatic review settings November 10, 2026 19:13

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants