my side of story

[sh2111sa]

Add some lines to the story

[floridop]

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.
The merges will be approved according to arrival time starting from October 23th, 22: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.

[floridop]

Hi @sh2111sa , I am not sure about what you're doing but there is still some garbage in your version. I will open a review.

[floridop]

It appears that your problems where generated when doing this merge commit: 7c913da

I suggest you restart from the commit before that this way:

# Retrieve the latest version of the upstream main
git checkout main
git pull upstream main
# Switch to the mystory branch
git checkout mystory
# restore the commit before the merge. NOTE: you will lose the commits done after that commit.
git reset 224099023879f43950669775a421d8465407b995
# retrieve the unchanged version of fairytale.md before the merge
git checkout fairytale.md
# perform a merge again
git merge main
# resolve conflicts
# After resolving, force push to your mystory branch. NOTE: this will delete the problematic commits on both your local copy and github, that is, will overwrite the changes history.
git push -f origin mystory

Does the above make sense for you? If you are unsure you can visit my office and I can explain in more detail.

Another way to go is to do the merge from the current upstream main and delete all that is contained in your version, keep all of the upstream main version and adding your contribution to that. It's in principle easy if you understand what you're doing, but from your mistakes I think you did not understand what happens in slides 97-102. If so we should definitely meet.