git - Github - make maste branch up to date with my local files?

Question

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

Answer 1

You should rebase your local commits on top of the (now updated) remote main branch, using git rebase.

cd /path/to/my/local/cloned/repo
git fetch
git rebase origin/main
git push

That way, you are:

• resolving any potential merge conflict locally (during the rebase, which replays your commits on top of origin/main)
• are pushing only new commit on top of the most recent version of origin/main