Git Product home page Git Product logo

Comments (4)

jdwilkin4 avatar jdwilkin4 commented on August 18, 2024 1

Hey @CBID2 !

I would also suggest adding a link to an article or video on how to resolve merge conflicts so if a beginner does run into that issue, even with the change in rules, they will know how to resolve it.
Maybe a short opensauced link would work in this case.

Just food for thought 👍

from pizza-verse.

CBID2 avatar CBID2 commented on August 18, 2024 1

Hey @CBID2 !

I would also suggest adding a link to an article or video on how to resolve merge conflicts so if a beginner does run into that issue, even with the change in rules, they will know how to resolve it.

Maybe a short opensauced link would work in this case.

Just food for thought 👍

Good idea @jdwilkin4! 😃 @adiati98 is working on a PR for merge conflicts. I'll add a link to that once it's merged. 😃

from pizza-verse.

adiati98 avatar adiati98 commented on August 18, 2024 1

Hey @BekahHW @CBID2,

Should I submit separate PR for:

  1. Changing the rule
  2. Adding a resolving conflict section.

Or should I put them in the same PR?

from pizza-verse.

CBID2 avatar CBID2 commented on August 18, 2024 1

Hey @BekahHW @CBID2,

Should I submit separate PR for:

  1. Changing the rule

  2. Adding a resolving conflict section.

Or should I put them in the same PR?

@adiati98, creating separate PRs does sound best :)

from pizza-verse.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.