https://ones.com/ja/blog/knowledge/git-merge-strategy-guide/