modify "git up" to merge changes if possible
sync vim