git Eclipse egit：如何与远程仓库同步？
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/10958152/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
Eclipse egit : How to synchronize with remote repo?
提问by Ashika Umanga Umagiliya
I am new to GIT and I used to commit to my local copy and then "push" to remote repository. Recently I modified my code from another computer and wanted to synchronize changes with my home-computer.
我是 GIT 的新手，我曾经提交到我的本地副本，然后“推送”到远程存储库。最近我从另一台计算机修改了我的代码，并希望与我的家用计算机同步更改。
But in the git synchronise view , after I mark files as "Mark as merged"(after resolving changes with local changes) how can I commit back to the remote repository ? (like in SVN?)
但是在 git synchronized 视图中，在我将文件标记为“标记为已合并”后（在解决本地更改的更改后）我如何提交回远程存储库？（就像在 SVN 中一样？）
(ie: even I click "Mark as Merged" the "red double-array icons" stays the same) Click for larger size
（即：即使我单击“标记为合并”，“红色双阵列图标”也保持不变） 单击以获得更大的尺寸
采纳答案by danidacar
I don't use synchronize that much because I use the following workflow:
我不太使用同步，因为我使用以下工作流程：
- fetch
- merge
* resolved merges are sent to git index
* unresolved merges need to be fixed
- add fixed merge to index
- commit
- push
回答by VonC
Mark as merged means added in the index after conflict resolution.
标记为合并意味着在冲突解决后添加到索引中。
You need to commit and push.
See "Committing a merge" in the Egit manual.
你需要提交和推送。
请参阅Egit 手册中的“提交合并”。
