part 2 MERGE IN ORDER #82
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
|
part 1 should resolve merge-conflicts |
part 1 MERGE IN ORDER!
ChloroticLeaf
approved these changes
Mar 7, 2025
|
WHY ARE THERE STILL CONFLICTS |
|
my teacher wont let me check on my computer but i think there arent any?? i
think github is hallucinating
…On Fri, Mar 7, 2025 at 9:55 AM Saturncorgi ***@***.***> wrote:
@Saturncorgi <https://github.com/Saturncorgi> requested your review on:
#82 <#82> part 2 MERGE IN
ORDER.
—
Reply to this email directly, view it on GitHub
<#82 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AZ2JPAIXZTZFSPR4IO6264T2THMQTAVCNFSM6AAAAABYRSSRM6VHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJWGYZTMMBRHA2DGMA>
.
You are receiving this because your review was requested.Message ID:
***@***.***>
|
|
try to remake the pr?
On Fri, Mar 7, 2025 at 9:57 AM William Shields ***@***.***>
wrote:
… my teacher wont let me check on my computer but i think there arent any??
i think github is hallucinating
On Fri, Mar 7, 2025 at 9:55 AM Saturncorgi ***@***.***>
wrote:
> @Saturncorgi <https://github.com/Saturncorgi> requested your review on:
> #82 <#82> part 2 MERGE IN
> ORDER.
>
> —
> Reply to this email directly, view it on GitHub
> <#82 (comment)>, or
> unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AZ2JPAIXZTZFSPR4IO6264T2THMQTAVCNFSM6AAAAABYRSSRM6VHI2DSMVQWIX3LMV45UABCJFZXG5LFIV3GK3TUJZXXI2LGNFRWC5DJN5XDWMJWGYZTMMBRHA2DGMA>
> .
> You are receiving this because your review was requested.Message ID:
> ***@***.***>
>
|
|
for the merge conflict I just preferred what was in main |
2025 03 07 emergency intervention
…into march-seven
…into march-seven
…into march-seven
March seven
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.