Output the latest code from github in Android Studio

Question

How to sync my local Android Studio project with the latest github code?
I want to download all the latest changes, but I do not want my local changes to be overwritten .
If there is a conflict, he should ask me to resolve these specific files.
Is there any way to achieve this?

Answer 1

"I want to download all the latest changes, but I do not want my local changes to be overwritten."

You probably want to “extract” the upstream before merging your changes.

VCS -> Git -> Fetch, this will update all your branches, so you can check them, and then use VCS -> Git -> Merge Changes to update the local code.

What suits your needs in the best way, I think. Usually I just push changes and resolve conflicts.

Answer 2

First, you can import your project into the main menu using the control version of Version Control. Then you can use VCS-> Update Project to download all the changes. This will leave your local changes and show you conflicts.