Menu
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 want my local changes overwritten.
If there is a conflict, it should ask me to resolve those particular files.
Is there a way to achieve this?
242
This can be done using git reset . First, make sure you have the most recent copy of that remote tracking branch by fetching. Then, use git reset --hard to move the HEAD pointer and the current branch pointer to the most recent commit as it exists on that remote tracking branch.
You can directly import GitHub projects into Android Studio. File -> New -> Project from Version Control -> GitHub. Then enter your GitHub username and password. Select the repository and hit clone.
In android studio 4.0, go to version control -> Log. Then select the commit you want to revert to. Choose Reset current branch to here. You ll see a popup, select Hard and its done.
"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.
70
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.
23
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
