Eclipse egit : How to synchronize with remote repo?

eclipse git version-control egit
Ashika Umanga Umagiliya picture Ashika Umanga Umagiliya · Jun 9, 2012 · Viewed 18.4k times · Source

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.

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?)

(ie: even I click "Mark as Merged" the "red double-array icons" stays the same) Click for larger size

enter image description here

Answer

johnlemon picture johnlemon · Jun 9, 2012

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

Related questions

How do you do merges using Git, Eclipse and Egit

I, like many others, love Eclipse as my ide of choice, and because of the way I work (moving about, different places, different projects) want to use Git for CVS. There is a plugin for Git in Eclipse, Egit, which …

Read More
How to change the current branch to master in Egit?

I want to know how to do this in Egit the eclipse plugin. This question has been asked many times for git but the answers involve some form of command language I do not have access to or know. Using …

Read More
How stable is the git plugin for eclipse?

I was intending to have a play with git, and was wondering if anyone had used the git plugin for eclipse I see it's at version 0.3.1, and was wondering if anyone knew how stable it was / any gotchas? Update: If …

Read More