Git. What is the correct way to get changes from the master repository and apply them to the local one?

Question

git

Good afternoon.

I once cloned a repository for myself, made a lot of changes that I needed. But a lot of new features have already appeared on the remote repository. How can I get these changes from a remote repository without destroying everything that I did locally?
thanks in advance

Answer 1

first commit everything that is done locally, then git pull and manually merge conflicts

Answer 2

There are several options:
1. the most innocuous: checkout your changes to a separate branch using git checkout -b , then switch to the master/main branch and do a git pull, then merge conflicts
2. use git fetch, check out the changes from the repository, then merge conflicts
3. there is also an option to "pocket" your changes via git stash, then git pull, then git stash apply, but you have to merge conflicts.
The choice is yours