merging server's response of unpushed changes into local built awareness of git repo