wei/pull

[FR] New mergeMethod `merge-ff` to only merge when un-fast-forwardable, otherwise hard reset

Open

#448 创建于 2022年5月31日

在 GitHub 查看
 (5 评论) (0 反应) (0 负责人)JavaScript (5,364 star) (720 fork)batch import
enhancementhelp wanted

描述

A nice mix of two current mergeMethod: hardreset and merge. Effectively simulate the default git merge behavior and make the commit history clean.

A use case: DIYgod/RSSHub has a pull.yml configuration file with mergeMethod: merge to prevent pull[bot] from overriding downstream manipulated forks (https://github.com/DIYgod/RSSHub/pull/9710). In such a case, merge-ff is a better solution.

贡献者指南

技术栈
javascriptnodejs
领域
ci cdtooling
议题类型
feature
难度面向新贡献者的预计实现难度，1 表示很小改动，5 表示专家级工作。
3
预计时间有经验贡献者完成调查、实现、测试并准备 pull request 的粗略时间范围。
half day
活动状态议题当前的可参与程度：新鲜、活跃、陈旧、阻塞或等待维护者输入。
stale
清晰度议题是否清楚说明期望改动、验收标准和下一步。
clear
前置要求
Basic understanding of git merge modesFamiliarity with pull (the bot) codebaseJavaScript knowledge
新手友好度1-100 的估计分数，表示该议题对首次贡献者的友好程度。
55
研究方向
Review the current implementation of merge methods (hardreset and merge) in the repository, likely in the source code directory. Understand the pull.yml configuration structure. Then design the new merge ff method that implements git merge ff only behavior with fallback to hard reset. Check the existing discussions in the issue comments for any specific requirements.