feat-#378: created readme for git conflicts

[rushil-b-patel]

Summary

A readme file for the common git conflicts that contributors face while contribting in open source.

Description

Created a readme file (GIT_CONFLICTS) in the root folder which includes common Q&A.

Issue(s) Addressed

Closes #378

Prerequisites

• [x] Have you followed all the CONTRIBUTING GUIDELINES?

[vercel[bot]]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
wanderlust	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 25, 2024 11:51am
wanderlust-backend	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 25, 2024 11:51am

[github-actions[bot]]

Hey @rushil-b-patel! Thanks for sticking to the guidelines! High five! 🙌🏻

[rushil-b-patel]

Hey @krishnaacharyaa sorry for the late response. I have made some changes with the help of co-pilot. Please review.

[krishnaacharyaa]

As Discussed in discord @rushil-b-patel

[krishnaacharyaa]

Closing as no inactive

[rushil-b-patel]

hey @krishnaacharyaa I'm sorry, I have been into placement stuff and getting time for this. But Please give me 2-3 days. I'll do it. I hope you understand.

[krishnaacharyaa]

Sure @rushil-b-patel , all the best for your placements, Hope you get the best !! I'm fine waiting tbh, but I was not able to see the interest in contributing, rather just to complete this for the sake of it... So had to close, Hope you get my perspective, If you come back with enthusiasm and actually contributing, happy to re-open this and guiding ...!

[rushil-b-patel]

sure @krishnaacharyaa , I'll get back to it... Thanks

[krishnaacharyaa]

@rushil-b-patel