Pulling down latest code from github to Android Studio

Question

How to sync my local Android Studio project with the latest code on github?
I want to download all the latest changes but I don\'t

Answer 1

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

Answer 2

"I want to download all the latest changes but I don't want my local changes overwritten"

You probably want to 'fetch' the upstream before merging your changes then.

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

That's what fits your needs the best, I think. Normally, I would just pull the changes and resolve the conflicts.