Gitea have 3 types of request of merge:
1. Rebase Merge
2. Rebase and Merge (--no-ff)
3. Squash Merge
Merge
"""bash
git merge <commit>
git checkout master
"""
Merge Squash: merge with only one record
"""bash
git merge —-squash <branch_name>
"""
Rebase Squash: Merge local records
"""bash
git rebase -i HEAD~~
"""
Reference:
[Git: 比較 Merge Squash 與 Rebase Squash](https://cythilya.github.io/2018/05/29/git-merge-squash-vs-rebase-squash/)
[連猴子都能懂的Git入門指南:合併分支](https://backlog.com/git-tutorial/tw/stepup/stepup2_4.html)
[連猴子都能懂的Git入門指南:使用 rebase -i 合併提交](https://backlog.com/git-tutorial/tw/stepup/stepup7_5.html)
[連猴子都能懂的Git入門指南:Merge --squash](https://backlog.com/git-tutorial/tw/stepup/stepup7_7.html)
