https://celery94.github.io/posts/133-merging-vs-rebasing--atlassian-git-tutorial_cn/