search

swapagarwal / awesome-inspiration

:fire: A curated list of content worth sharing to help you get inspired! :zap:
https://swapagarwal.github.io/awesome-inspiration/
254 stars 185 forks source link

resolved previous conflict #223

Open savvyviv opened 1 year ago

savvyviv commented 1 year ago

added 2 songs and 2 books

jahway603 commented 1 year ago

Hi @savvyviv , I'm confused by this PR. I know there were previous conflicts in PR https://github.com/swapagarwal/awesome-inspiration/pull/192 but the confusion for me in PR #223 is seen if we look at the Files Changed in this PR then it appears as if lots of the current README.md is being deleted.

Please try this

  1. Create a branch in your repo, so you don't lose your work.
  2. Sync your fork's master branch with this one.
  3. Then manually edit the markdown in the new README.md to incorporate your changes.
  4. Then submit a new PR with your changes against the latest README.md.