open-sauced / intro

Empowering Your Open Source Journey: From First Contribution to Project Leadership
https://opensauced.pizza/learn
Other
536 stars 110 forks source link

docs: Move chapter "Understanding Merge Conflicts" #91

Closed adiati98 closed 10 months ago

adiati98 commented 11 months ago

Description

The chapter Understanding Merge Conflicts currently lives at the end of the intro course, right after "Glossary". It would make more sense if it becomes a section rather than a standalone chapter. How to Contribute to Open Source chapter will be suitable to hold this section.

Suggestion

Move this section into the How to Contribute to Open Source chapter, right after Let's Get Practical section. This would also be in line with the suggestion in issue #81.

adiati98 commented 11 months ago

@BekahHW @CBID2 any thought on this?

CBID2 commented 11 months ago

@BekahHW @CBID2 any thought on this?

That makes sense @adiati98. Can I do a PR this time?

BekahHW commented 11 months ago

Great idea!