Repository navigation
Practice resolving a decaf menu conflict - #3
Open
charlestang06 wants to merge 2 commits into
Open
charlestang06 wants to merge 2 commits into
charlestang06 wants to merge 2 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.