git ship merges before squashing