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.

Sign up for GitHub

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

Jump to bottom

docs: Move chapter "Understanding Merge Conflicts" #91

Closed
adiati98 opened this issue Nov 8, 2023 · 3 comments · Fixed by #92
Closed

docs: Move chapter "Understanding Merge Conflicts" #91

adiati98 opened this issue Nov 8, 2023 · 3 comments · Fixed by #92
Assignees
@CBID2
Labels
documentation Improvements or additions to documentation

Comments

@adiati98
Copy link
Member

adiati98 commented Nov 8, 2023

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 adiati98 added documentation Improvements or additions to documentation 👀 needs triage labels Nov 8, 2023
@adiati98
Copy link
Member Author

adiati98 commented Nov 8, 2023

@BekahHW @CBID2 any thought on this?

@CBID2
Copy link
Contributor

CBID2 commented Nov 8, 2023

@BekahHW @CBID2 any thought on this?

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

@BekahHW
Copy link
Member

BekahHW commented Nov 8, 2023

Great idea!

@CBID2 CBID2 mentioned this issue Nov 10, 2023
Merged
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@CBID2 CBID2

Labels
documentation Improvements or additions to documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

docs: Move chapter "Understanding Merge Conflicts" to Let's Contribute section CBID2/intro
3 participants
@BekahHW @adiati98 @CBID2