将最新的代码从github下拉到Android Studio [英] Pulling down latest code from github to Android Studio

问题描述

如何将本地Android Studio项目与github上的最新代码同步？我想要下载所有最新的更改，但我不希望覆盖本地更改。如果有冲突，它应该要求我解决这些特定的文件。有没有办法做到这一点？

How to sync 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?

推荐答案

我想下载所有最新的更改，但我不希望本地
变化被覆盖

"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，这将更新所有分支，以便您检查它们，然后使用VCS - > Git - > Merge Changes更新您的本地代码。

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.

这篇关于将最新的代码从github下拉到Android Studio的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！