search

barbarer / py4e-int

Python for Everybody - Interactive
GNU General Public License v3.0
4 stars 48 forks source link

Strings and Lists Completed #86

Closed nana-beep closed 3 years ago

barbarer commented 3 years ago

Please fix the conflicts first.

nana-beep commented 3 years ago

Dear Professor Ericson,

May I receieve clarifications on how to fix the conflicts?

Thank you.

Best regards, Jina

On Thu, Aug 5, 2021, 8:29 AM Barbara Ericson @.***> wrote:

Please fix the conflicts first.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/barbarer/py4e-int/pull/86#issuecomment-893419318, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOI7IUR65ZKCLNIZ5VPD34TT3J7YVANCNFSM5BSQFVEQ . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email .

barbarer commented 3 years ago

I went ahead and merged them. I had made changes to the list mixed up code and so had you. That is why it is important that you do git fetch upstream before you commit and push. You will be notified if there are any conflicts when you do that. You can then edit the file and it will show you how they differ. You save the changes you want and then save the file.

nana-beep commented 3 years ago

Dear Professor Ericson,

I understand, thank you so much. I'll make sure to do that next time.

Best regards, Jina Kim

On Thu, Aug 5, 2021, 8:40 AM Barbara Ericson @.***> wrote:

I went ahead and merged them. I had made changes to the list mixed up code and so had you. That is why it is important that you do git fetch upstream before you commit and push. You will be notified if there are any conflicts when you do that. You can then edit the file and it will show you how they differ. You save the changes you want and then save the file.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/barbarer/py4e-int/pull/86#issuecomment-893426167, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOI7IUUYX4KWQ5NNKIHV6ATT3KBEDANCNFSM5BSQFVEQ . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email .