git sync and squash