Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add answers the sandstorms #77

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

iceman7143
Copy link

No description provided.

@floridop
Copy link
Owner

floridop commented Oct 7, 2023

Hi! Thanks for your submission.

Unfortunately it seems that there were changes in the main that conflict with yours.
Could you please perform a merge as described in Tutorial 3 slides 90-103 and integrate those changes?
Start with synchronizing your local main with my upstream main as described in slide 98.
We do not want to lose any existing content, so you should keep what others have written and add yours.
You're free to reorganize the content blocks so that it still makes a story, but please do minimal changes
to the content of what others have written to integrate them with yours.
You have time until the 10th of October at 23:59.
If you can't make it by that time or you are done before the deadline,
please add a comment in github so that I can progress with another student.

@floridop
Copy link
Owner

Hi
You did not perform the task in the allocated time, therefore I put you on hold. You will be reassigned the task later during the course.

@floridop floridop added the on hold 2 Student must wait until teacher allows them to perform the task label Oct 11, 2023
@floridop
Copy link
Owner

Hi, since the course is coming to an end you can resolve the merge conflicts anytime now.

@floridop floridop removed the on hold 2 Student must wait until teacher allows them to perform the task label Oct 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants