search

open-sauced / intro

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

Feature: add section for resolving merge conflicts #81

Closed jdwilkin4 closed 8 months ago

jdwilkin4 commented 8 months ago

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

Contributing Docs

Lymah123 commented 8 months ago

Hi @jdwilkin4 , can I work on the issue?

Lymah123 commented 8 months ago

Hi @jdwilkin4 , can I work on the issue?

Hi @CBID2 , can I work on the issue?

CBID2 commented 8 months ago

Hi @jdwilkin4 , can I work on the issue?

Hi @CBID2 , can I work on the issue?

Let’s see if @jdwilkin4 wants to first.

Lymah123 commented 8 months ago

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!

jdwilkin4 commented 8 months ago

no, I am not interested in working on this. It's all yours @Lymah123 👍

Lymah123 commented 8 months ago

Okay @jdwilkin4, thank you.

Lymah123 commented 8 months ago

@CBID2 , please assign this to me.