Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Eclipse egit : How to synchronize with remote repo?

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

like image 598
Ashika Umanga Umagiliya Avatar asked Jun 09 '12 03:06

Ashika Umanga Umagiliya


2 Answers

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
like image 142
johnlemon Avatar answered Oct 14 '22 21:10

johnlemon


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.

like image 23
VonC Avatar answered Oct 14 '22 20:10

VonC