my side of the story #99
Conversation
|
Hi! The fact that there is already a conflict in this PR makes me think there's still something wrong in the status of your git... However, here's how to carry on the exercise: |
|
Hello
I was wondering, as I have 4/5 points as of right now. Is that a passing
grade? if it is, I think I am willing to give up on the last part at this
point.
…On Sat, Nov 4, 2023 at 9:24 AM Florido Paganelli ***@***.***> wrote:
Hi! The fact that there is already a conflict in this PR makes me think
there's still something wrong in the status of your git...
However, here's how to carry on the exercise:
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.
—
Reply to this email directly, view it on GitHub
<#99 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/BCGMSBEBKCVLT4UDZCMVB6TYCYCT3AVCNFSM6AAAAAA64XH45GVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTOOJTGM4TGMRUHA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
|
Hi |
No description provided.