wei/pull

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

Open

#448 opened on May 31, 2022

View on GitHub
 (5 comments) (0 reactions) (0 assignees)JavaScript (5,364 stars) (720 forks)batch import
enhancementhelp wanted

Description

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.

Contributor guide

Tech stack
javascriptnodejs
Domain
ci cdtooling
Issue type
feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
half day
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
stale
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
clear
Prerequisites
Basic understanding of git merge modesFamiliarity with pull (the bot) codebaseJavaScript knowledge
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
55
Research direction
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.