git

1.git rebase or merge

post-thumbnail