Using Git in the Real World lesson: fix wording to be in line with prior instruction #28635
Conversation
This file contains 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
The 3rd knowledge check question refers to performing a merge of a feature branch into main, but in the assignment subsection 'Ongoing Workflow' instruction 4, we are asked to perform a merge of main into a feature branch to check for merge conflicts.
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.
Because
The 3rd knowledge check question refers to performing a merge of a feature branch into main, but in the assignment subsection 'Ongoing Workflow' that the knowledge check links to (instruction 4), we are asked to perform a merge of main into a feature branch to check for merge conflicts. The wording of the knowledge check could be changed to avoid potential confusion.
This PR
Issue
None
Additional Information
None
Pull Request Requirements
location of change: brief description of changeformat, e.g.Intro to HTML and CSS lesson: Fix link textBecausesection summarizes the reason for this PRThis PRsection has a bullet point list describing the changes in this PRIssuesection