You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.
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:
Go to the course
Click on first pull request and continue to the 2nd
In 2nd pull request, Scroll down and there is no conflict to resolve.
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!
The text was updated successfully, but these errors were encountered:
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:
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!
The text was updated successfully, but these errors were encountered: