Remote Git Server and Merging:Git & Eclipse