Feature: add section for resolving merge conflicts
jdwilkin4 opened this issue ยท comments
Type of feature
๐ Feature
Current behavior
Under the How to Contribute to Open Source section, there is a lot of helpful information but it seems to miss a section on how to resolve merge conflicts.
Suggested solution
I think this is an important section to include because it is one of the common issues I have seen as a maintainer.
I think adding a couple of sentences on what merge conflicts are and how to resolve them inside the VS code editor would be helpful ๐
Additional context
No response
Code of Conduct
- I agree to follow this project's Code of Conduct
Contributing Docs
- I agree to follow this project's Contribution Docs
Hi @jdwilkin4 , can I work on the issue?
Hi @jdwilkin4 , can I work on the issue?
Hi @CBID2 , can I work on the issue?
Hi @jdwilkin4 , can I work on the issue?
Hi @CBID2 , can I work on the issue?
Letโs see if @jdwilkin4 wants to first.
Hi @jdwilkin4 , can I work on the issue?
Hi @CBID2 , can I work on the issue?
Letโs see if @jdwilkin4 wants to first.
Alright. Thank you!
no, I am not interested in working on this.
It's all yours @Lymah123 ๐
Okay @jdwilkin4, thank you.