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.