Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

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

Open
JitrZ opened this issue Apr 25, 2021 · 1 comment
Open

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

JitrZ opened this issue Apr 25, 2021 · 1 comment
Labels
bug Something isn't working

Comments

@JitrZ
Copy link

JitrZ commented Apr 25, 2021

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!

@JitrZ JitrZ added the bug Something isn't working label Apr 25, 2021
@JitrZ
Copy link
Author

JitrZ commented Apr 25, 2021

So there is no way to complete this course because don't know how to tell the bot what to do in the 4th pull request

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant