How to download a remote repository correctly?

Question

git

Hello!
I have a project located locally, which is then uploaded to bitbacket
In a project that is uploaded to bitbacket, new changes were made by another developer
In turn, I also made changes to the local project (+ I do not have new changes that were made by another developer)
I use SourceTree
How what is the right thing to do in this situation?
i.e. it is necessary to fill in my changes, while nothing is lost

Answer 1

documentation here: https://git-scm.com/book/en/v2

Answer 2

- first git rebase . ( https://habrahabr.ru/post/161009/). in JetBrains Ide-shkah there is a battn in the interface
- if there are conflicts - resolve. Again, the IDE provides an interface for this
- then your code is quietly in the turnip