githubtraining / managing-merge-conflicts

Course repo for Learning Lab course "Managing merge conflicts". Template repo ➡

Course: Managing Merge Conflicts

This repository powers the Learning Lab course Managing Merge Conflicts.

Every Learning Lab course is made up of:

• a course repository, and
• a template repository

The course repository is written in YAML and Markdown. The template repository could be written in any language that supports the learning objectives.

For more information on the goals of this course, check out the course-details.md.

Contribute

See something we could improve? Check out the contributing guide in the community contributors repository for more information on the types of contributions we ❤️ and instructions.

We ❤️ our community and take great care to ensure it is fun, safe and rewarding. Please review our Code of Conduct for community expectations and guidelines for reporting concerns.

License

All Learning Lab course repositories are licensed under CC-BY-4.0 (c) 2019 GitHub, Inc. The template repositories associated with each course may have different licenses.

When using the GitHub logos, be sure to follow the GitHub logo guidelines

managing-merge-conflicts's Issues

Links to the .com instead of local course in GHES

Bug Report

This is a simple one, so I'm wiping out the template. This links to LL on the web instead of the current version of LL when running in GHES.

https://github.com/githubtraining/managing-merge-conflicts/blob/master/responses/00_welcome-conflict-1.md

/cc @crichID @brianamarie @hectorsector @JasonEtco

User stuck on lesson 9

Hey @githubtraining/learning-engineering 👋 When someone gets a moment, there’s a community forum post that has me confused. It looks like the user is doing everything right, but the bot isn’t recognizing it.

Post: https://github.community/t5/GitHub-Learning-Lab/Stuck-on-lesson-9-in-Merge-Conflicts/m-p/19314
Repo/PR where they’re stuck: dream-ardor/merge-conflict#4

Check for "pencil" language

Since updates have been made to the GitHub.com UI, the "edit" button is no longer a pencil. However, it will likely remain a pencil for users on older versions of GHES. We should update the instructions to be more inclusive regardless of version.

Doesn't detect when merge conflict is not fully resolved.

Bug Report

Current behavior
I only removed some of the markers for the merge conflict. It still considered the merge conflict resolution successful.

Reproduction
Steps to reproduce the behavior in the course:

1. Take the course using the UI option through Step 3: Resolve more complex conflicts
2. Delete the lines with > and < from the merge conflict but leave in the ======= lines
3. The step is considered to be completed successfully.

Expected behavior
I would expect it to detect that all markers have not been removed and have the student fix it.

Possible solution
If you have suggestions, we'd love to hear them. If not, that's ok too.

Additional context
GHES v2.19.6, LL v0.5.0

/cc @crichID @brianamarie @hectorsector @JasonEtco

Test - Happy Path (7/4/18)

Bugs

• Format on join this course screen feels off.
  • Image
• Learning Lab steps are not reflected
  • Process:
    • Click join this course
    • Merge-conflict already exists
    • Delete merge-conflict
    • Click join this course
    • Something went wrong error prompt
    • This page persists, but the repository was generated successfully. Issue 1 was not generated.

cc: @JasonEtco

Happy Path - 07/19/18

@JasonEtco \ @hollenberry

Test Results

• After merging first PR (change-skills branch) no response from the bot, has a "wait for my response" message, looks like it should point me to this: Second merge: Let's try a conflict #1
• This message
  
  should have been posted on the first issue
• Second merge PR: fixed merge conflict, don't get a response from the app. Can't merge because it needs approval.

I completed the rest of the activities, but wasn't getting any responses from the bot.

Include GitHub Desktop in course preferences

GitHub desktop shipped a big update to how merge conflicts are handled in desktop that's hopefully much simpler and easier for users to follow. I'd like to incorporate GitHub Desktop instructions as a course preference.

Many thanks to @billygriffin for reaching out and letting me know about these Desktop updates.

Reminder to self - ping @billygriffin to review once this is in staging. ✨

Update to Activity Instructions

It came to light during a live workshop that some steps or activities are not with clear instructions. This led to some trainee's being stuck at the steps. Before I propose to make the changes, I would like to get a second pair of 👀 on these activities to ensure that is it not a "one off case"

Activity Steps and UI mismatch

- Steps 4, 5 and 6 could be rephrased?

- The Label Add your review is not shown when a reviewer is the trainee and automatically assigned as a reviewer

- the below is an example when no reviewers are added. It then shows the correct label mentioned above

/cc @JasonEtco @hectorsector

Files changed and commits in Pull request #2 and #4

Bug Report

Current behavior
I take the managing merge conflicts course and see that in the 2nd pull request that talks about another user's change there is no conflicts and no resolving conflicts button and check files changed and commits and just approve commit and continue In the 4th pull request that talks about create your own conflict there is an already a conflict there and according to the information, I think the files and commits for these two pull request must substitute.

Reproduction
Steps to reproduce the behavior in the course:

1. Go to the course
2. Click on first pull request and continue to the 2nd
3. In 2nd pull request, Scroll down and there is no conflict to resolve.
4. See error

Expected behavior
For the 2nd pull request must be a conflict and for the 4th must not be a conflict and the user must create it according to the guidance given.

Possible solution
I think it's related to the config.yml file but not sure!