search

microsoft / pxt-arcade

Arcade game editor based on Microsoft MakeCode
https://arcade.makecode.com
MIT License
481 stars 209 forks source link

No UI for resolving Git conflicts #1908

Closed abegel closed 1 year ago

abegel commented 4 years ago

When there are conflicts caused by two people making changes to the same MakeCode project that has been shared by Github, there is no facility/UI for resolving those conflicts. In fact, without teaching the users how to resolve conflicts in Github (which is super difficult to teach to the under 12 crowd), there's no way to fix this.

I finally figured out we could tell kids to delete the merge-1 branch that is created during the conflict and close out the pull request. Then one kid's changes are deleted, but at least the project is back on track.

pelikhan commented 4 years ago

For now they can stay on master; we have conflict resolution when pulling there. Still wip for PRs

abegel commented 4 years ago

What does that mean to have them stay on master?

Here's our scenario:

  1. Two kids working together on a project where they both want to work on the same MakeCode Arcade game independently while working at their own homes. They're both working off the #master branch.
  2. They do not properly negotiate working times and both make changes to the same version of the project and check in at the same time, neglecting to pull remote changes before hitting commit.
pelikhan commented 4 years ago

We always pull origin before doing a commit and we merge conflict resolution in MakeCode in master when pulling changes from GitHub. So if they have conflicts, they will have to resolve them before doing the commit.

abegel commented 4 years ago

Yep, and there's no UI or instructions for doing that conflict resolution. That's a hole in the workflow. Could you provide instructions on how to resolve it for "IT Support"? (meaning the teacher).

pelikhan commented 4 years ago

There is UI for conflict resolution but it seems that you are not seeing it or it might have broken up. Again, only when pulling changes from master currently.

From: Andrew Begel notifications@github.com Sent: Tuesday, May 26, 2020 6:03:56 PM To: microsoft/pxt-arcade pxt-arcade@noreply.github.com Cc: Peli de Halleux jhalleux@microsoft.com; Assign assign@noreply.github.com Subject: Re: [microsoft/pxt-arcade] No UI for resolving Git conflicts (#1908)

Yep, and there's no UI or instructions for doing that conflict resolution. That's a hole in the workflow. Could you provide instructions on how to resolve it for "IT Support"? (meaning the teacher).

— You are receiving this because you were assigned. Reply to this email directly, view it on GitHubhttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fpxt-arcade%2Fissues%2F1908%23issuecomment-634362191&data=02%7C01%7Cjhalleux%40microsoft.com%7C2fade6599ddc49ad83c008d801d9d505%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261382469977595&sdata=E3a1kj1RLL4Mn9IVzdI2LOp6tHXENvYn9GTtU0tKNvE%3D&reserved=0, or unsubscribehttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAA73QKO7Q3G3ASRBW7DYNRLRTRRHZANCNFSM4NLL2HPQ&data=02%7C01%7Cjhalleux%40microsoft.com%7C2fade6599ddc49ad83c008d801d9d505%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261382469977595&sdata=my1tUv8UkGPLIUJ2znpN7k2bsOx0je0RIfIJIzUECmM%3D&reserved=0.

pelikhan commented 4 years ago

Definitely a hole in PRs flow.

From: Peli de Halleux jhalleux@microsoft.com Sent: Tuesday, May 26, 2020 6:06:10 PM To: microsoft/pxt-arcade reply@reply.github.com; microsoft/pxt-arcade pxt-arcade@noreply.github.com Cc: Assign assign@noreply.github.com Subject: Re: [microsoft/pxt-arcade] No UI for resolving Git conflicts (#1908)

There is UI for conflict resolution but it seems that you are not seeing it or it might have broken up. Again, only when pulling changes from master currently.

From: Andrew Begel notifications@github.com Sent: Tuesday, May 26, 2020 6:03:56 PM To: microsoft/pxt-arcade pxt-arcade@noreply.github.com Cc: Peli de Halleux jhalleux@microsoft.com; Assign assign@noreply.github.com Subject: Re: [microsoft/pxt-arcade] No UI for resolving Git conflicts (#1908)

Yep, and there's no UI or instructions for doing that conflict resolution. That's a hole in the workflow. Could you provide instructions on how to resolve it for "IT Support"? (meaning the teacher).

— You are receiving this because you were assigned. Reply to this email directly, view it on GitHubhttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fpxt-arcade%2Fissues%2F1908%23issuecomment-634362191&data=02%7C01%7Cjhalleux%40microsoft.com%7C2fade6599ddc49ad83c008d801d9d505%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261382469977595&sdata=E3a1kj1RLL4Mn9IVzdI2LOp6tHXENvYn9GTtU0tKNvE%3D&reserved=0, or unsubscribehttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAA73QKO7Q3G3ASRBW7DYNRLRTRRHZANCNFSM4NLL2HPQ&data=02%7C01%7Cjhalleux%40microsoft.com%7C2fade6599ddc49ad83c008d801d9d505%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261382469977595&sdata=my1tUv8UkGPLIUJ2znpN7k2bsOx0je0RIfIJIzUECmM%3D&reserved=0.

pelikhan commented 4 years ago

Wait is this blocks or JavaScript?

From: Peli de Halleux jhalleux@microsoft.com Sent: Tuesday, May 26, 2020 6:07:11 PM To: microsoft/pxt-arcade reply@reply.github.com; microsoft/pxt-arcade pxt-arcade@noreply.github.com Cc: Assign assign@noreply.github.com Subject: Re: [microsoft/pxt-arcade] No UI for resolving Git conflicts (#1908)

Definitely a hole in PRs flow.

From: Peli de Halleux jhalleux@microsoft.com Sent: Tuesday, May 26, 2020 6:06:10 PM To: microsoft/pxt-arcade reply@reply.github.com; microsoft/pxt-arcade pxt-arcade@noreply.github.com Cc: Assign assign@noreply.github.com Subject: Re: [microsoft/pxt-arcade] No UI for resolving Git conflicts (#1908)

There is UI for conflict resolution but it seems that you are not seeing it or it might have broken up. Again, only when pulling changes from master currently.

From: Andrew Begel notifications@github.com Sent: Tuesday, May 26, 2020 6:03:56 PM To: microsoft/pxt-arcade pxt-arcade@noreply.github.com Cc: Peli de Halleux jhalleux@microsoft.com; Assign assign@noreply.github.com Subject: Re: [microsoft/pxt-arcade] No UI for resolving Git conflicts (#1908)

Yep, and there's no UI or instructions for doing that conflict resolution. That's a hole in the workflow. Could you provide instructions on how to resolve it for "IT Support"? (meaning the teacher).

— You are receiving this because you were assigned. Reply to this email directly, view it on GitHubhttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fpxt-arcade%2Fissues%2F1908%23issuecomment-634362191&data=02%7C01%7Cjhalleux%40microsoft.com%7C2fade6599ddc49ad83c008d801d9d505%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261382469977595&sdata=E3a1kj1RLL4Mn9IVzdI2LOp6tHXENvYn9GTtU0tKNvE%3D&reserved=0, or unsubscribehttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAA73QKO7Q3G3ASRBW7DYNRLRTRRHZANCNFSM4NLL2HPQ&data=02%7C01%7Cjhalleux%40microsoft.com%7C2fade6599ddc49ad83c008d801d9d505%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261382469977595&sdata=my1tUv8UkGPLIUJ2znpN7k2bsOx0je0RIfIJIzUECmM%3D&reserved=0.

abegel commented 4 years ago

Blocks.

abegel commented 4 years ago

So part of the conflict were the graphics for the diff.

pelikhan commented 4 years ago

Collab on blocks still needs a bunch of work for sure.

From: Andrew Begel notifications@github.com Sent: Tuesday, May 26, 2020 6:12:13 PM To: microsoft/pxt-arcade pxt-arcade@noreply.github.com Cc: Peli de Halleux jhalleux@microsoft.com; Assign assign@noreply.github.com Subject: Re: [microsoft/pxt-arcade] No UI for resolving Git conflicts (#1908)

So part of the conflict were the graphics for the diff.

— You are receiving this because you were assigned. Reply to this email directly, view it on GitHubhttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fpxt-arcade%2Fissues%2F1908%23issuecomment-634364782&data=02%7C01%7Cjhalleux%40microsoft.com%7C52fea9d106a14a717fda08d801dafd4b%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261387350394816&sdata=%2BB%2B2TSUHGj72kWYmC2RaaW0SE56nXDXq6idDcld87mo%3D&reserved=0, or unsubscribehttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAA73QKOM62U543OK4T3FIZTRTRSG3ANCNFSM4NLL2HPQ&data=02%7C01%7Cjhalleux%40microsoft.com%7C52fea9d106a14a717fda08d801dafd4b%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637261387350404809&sdata=L1tCP1gOAgfWJcM73uPlUJ7PsWtofbfVBfhYbZHtE%2Fg%3D&reserved=0.