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.

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

Episode 9: Conflicts key point needs revision #629

munkm opened this issue May 6, 2019 · 0 comments


None yet
1 participant
Copy link

commented May 6, 2019

In Episode 9: Conflicts the first key point at the end of the episode reads:

Conflicts occur when two or more people change the same file(s) at the same time.

This isn't quite true. A conflict won't necessarily happen if two different lines are modified. It'll be triggered if the same line(s) of the same file(s) are changed. This key point in this episode should be revised to reflect this.

@munkm munkm added this to the June 2019 Release milestone May 6, 2019

@munkm munkm referenced this issue May 6, 2019


June 2019 Lesson Release checklist #611

7 of 12 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.