I'm a github beginner so don't judge :). I've a github project with a few others with only the main branch. I cloned the repository and made many changes. While I did these changes, someone else pushed their changes on github. They pushed one file and some minor changes in the main file.
What is the best way to push my changes to github without losing any (or the least amount) of code?
question from:https://stackoverflow.com/questions/65621382/github-make-maste-branch-up-to-date-with-my-local-files