github Merge method
2024-08-29 17:54:14
About merge methods on GitHub - User Documentation https://help.github.com/articles/about-merge-methods-on-github/
Merge request
Collapse
Customize your merge request restrictions.
Merge method
Merge commit
A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
Merge commit with semi-linear history
A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. This way you could make sure that if this merge request would build, after merging to target branch it would also build.
When fast-forward merge is not possible, the user is given the option to rebase.
A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. This way you could make sure that if this merge request would build, after merging to target branch it would also build.
When fast-forward merge is not possible, the user is given the option to rebase.
Fast-forward merge
No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
When fast-forward merge is not possible, the user is given the option to rebase.
No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
When fast-forward merge is not possible, the user is given the option to rebase.
Only allow merge requests to be merged if the pipeline succeeds
Pipelines need to be configured to enable this feature.
Pipelines need to be configured to enable this feature.
Only allow merge requests to be merged if all discussions are resolved
Automatically resolve merge request diff discussions when they become outdated
Show link to create/view merge request when pushing from the command line
最新文章
- 开发管理系统时，安装sqlserver2005问题整理
- Linux安全基础：网络配置命令
- 利用eclips创建一个maven项目
- （转）8 Tactics to Combat Imbalanced Classes in Your Machine Learning Dataset
- Golang学习 - errors 包
- Reset / Validate Buffer
- 非线性规划问题的matlab求解
- BZOJ 3505 CQOI 2014 数三角形 数学
- crmsql句子的实体关系实体字段的信息窗口
- C语言之冒泡排序
- eclipse下进行spark开发（已实践）
- CYQ.Data V5 分布式自动化缓存设计介绍（二）
- 分布式缓存之Ehcache与terracotta - Terracotta服务器概念篇
- E:I Think I Need a Houseboat-poj
- codeforces 888G Xor-MST
- Ubuntu 18.04 安装 Apache, MySQL, PHP7, phpMyAdmin
- python - 编程规范问题
- Freemaker的了解
- 安装ruby&gem
- 一个基于jquery的智能提示控件intellSeach.js