Open
Conversation
I don't know where the conflict was dijwubgurwbgurwgb
There was a problem hiding this comment.
Pull request overview
Adds file.txt content intended to represent “feature branch 2” changes in the repository’s Git/GitHub lab materials (used in the merge-conflict example in README.md).
Changes:
- Introduces a new
file.txtwith sample “feature” text for the branch scenario.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @@ -0,0 +1,5 @@ | |||
| This is a very important feature of this project! | |||
There was a problem hiding this comment.
README.md describes that file.txt was initially added on feature_branch_1 and feature_branch_2 was created after that. In this PR, file.txt is being introduced on this branch, which makes the tutorial narrative/merge-conflict example inconsistent. Either add file.txt on the branch intended by the README, or update the README instructions/screenshots to match this history.
Suggested change
| This is a very important feature of this project! | |
| This file is used for demonstrating merge conflicts in this project. |
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.
No description provided.