shelcia / noobcodes-docs

Simplified Data structure and Algorithm solutions for Beginner in Python
https://noobcodes-docs.netlify.app/
6 stars 26 forks source link

Solved issue #130 and #131 #575

Closed SattyamSamania closed 1 year ago

SattyamSamania commented 1 year ago

Issue Number:

netlify[bot] commented 1 year ago

Deploy Preview for noobcodes-docs ready!

Name Link
Latest commit 252bf51ff426a7021b74c9208a51399dd6e5bb10
Latest deploy log https://app.netlify.com/sites/noobcodes-docs/deploys/63aff9bcaeee0d00084ba771
Deploy Preview https://deploy-preview-575--noobcodes-docs.netlify.app
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

shelcia commented 1 year ago

resolve conflicts

SattyamSamania commented 1 year ago

resolve conflicts

@shelcia What other changes should I have to do now?

shelcia commented 1 year ago

resolve conflicts

SattyamSamania commented 1 year ago

resolve conflicts

@shelcia The option of Resolve Conflicts is hidden.

shelcia commented 1 year ago

Step 1: From your project repository, check out a new branch and test the changes.

git checkout -b SattyamSamania-feature master git pull https://github.com/SattyamSamania/noobcodes-docs.git feature Step 2: Merge the changes and update on GitHub.

git checkout master git merge --no-ff SattyamSamania-feature git push origin master

SattyamSamania commented 1 year ago

@shelcia Does it create a problem if I push the master branch?

shelcia commented 1 year ago

@shelcia Does it create a problem if I push the master branch?

you cannot push it to master directly you will have to create PR

SattyamSamania commented 1 year ago

@shelcia I have done the steps mentioned by you.

shelcia commented 1 year ago

the conflicts aren't resolved