所以我们需要执行 git merge master 将主分支向 F 分支合并，合并后 git 会发现 commit1 到 commit4 提交的内容和 F 分支上 commit5 的修改内容是完全相同的，会自动进行合并，内容不变，但多了一个 commit5。

Need to undo a git push? Here is how to revert a pushed Git commit to a remote GitHub, GitLab or Bitbucket repo.

In this GitLab merge branch to master example, we explain why a GitLab merge into master is different from other operations, and how to accomplish this task with a GitLab master merge request.

Learn how to resolve Merge Conflicts in Git using this guide. Merge Conflicts can occur if the same parts of code are changed in different branches.