Added Field of Fires board game #276
Merged
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
|
@edm00se I don't know how this merge conflict occur, Do I need to solve the merge conflict? |
|
When the same lines of a file are edited, like when the previous PR merged and may have touched on some of the same lines, git detects the potential conflict and basically requires human intervention for it to be made right. |
edm00se
reviewed
Oct 12, 2023
edm00se
approved these changes
Oct 12, 2023
|
refs #269 |
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.
Submitting this PR means you have:
Once your PR is created, it will trigger a build a GitHub Action (Awesome-Lint). This includes a format linting process, so if there are any issues with the build, please address them.
Do you have further questions? Check the contribution guidelines or open an issue.
When you're ready, check off the above acknowledgements and continue with your Pull Request... and thanks!