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.

Sign up for GitHub

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

Jump to bottom

No UI for resolving Git conflicts #1908

Closed
abegel opened this issue May 26, 2020 · 10 comments · Fixed by microsoft/pxt#9489
Closed

No UI for resolving Git conflicts #1908

abegel opened this issue May 26, 2020 · 10 comments · Fixed by microsoft/pxt#9489
Assignees
@pelikhan
Labels
enhancement New feature or request github-integration

Comments

@abegel
Copy link

abegel commented May 26, 2020

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
Copy link
Member

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

@pelikhan pelikhan self-assigned this May 26, 2020
@abegel
Copy link
Author

abegel commented May 27, 2020

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
Copy link
Member

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
Copy link
Author

abegel commented May 27, 2020

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
Copy link
Member

pelikhan commented May 27, 2020 via email

@pelikhan
Copy link
Member

pelikhan commented May 27, 2020 via email

@pelikhan
Copy link
Member

pelikhan commented May 27, 2020 via email

@abegel
Copy link
Author

abegel commented May 27, 2020

Blocks.

@abegel
Copy link
Author

abegel commented May 27, 2020

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

@pelikhan
Copy link
Member

pelikhan commented May 27, 2020 via email

@abchatra abchatra added bug Something isn't working github-integration p2 enhancement New feature or request and removed bug Something isn't working p2 labels Jun 16, 2020
@Jaqster Jaqster mentioned this issue Jan 27, 2023
Closed
@eanders-ms eanders-ms mentioned this issue May 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@pelikhan pelikhan

Labels
enhancement New feature or request github-integration
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

GitHub Integration: Don't commit block pngs to repo microsoft/pxt
3 participants
@pelikhan @abegel @abchatra