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

Continued the story, added ASCII art #124

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

sebebbeb
Copy link

@sebebbeb sebebbeb commented Oct 5, 2024

I continued the story per the guidelines and added ASCII art.

@floridop
Copy link
Owner

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 2 slides 102-114 and integrate those changes?
Read the theory in slides 102-104 and then start the practice
by synchronizing your local and remote main with my upstream main as described in slide 105.
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.
The merges will be approved according to arrival time starting from October 30th, 17:00,
so expect that you need to merge several times after that time.
If I do not approve the changes you will be asked to update the content.

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.

2 participants