Question

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

Answer 1

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