2017-01-17-17-34-57-1|squash commits|squash-git-commits|squash-git-commits-1|squash-git-commits-2|merge_strategies