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 (720 forks)batch import
enhancementhelp wanted

Repository metrics

Stars
 (5,364 stars)
PR merge metrics
 (No merged PRs in 30d)

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

Research direction
Examine the existing merge methods (hardreset, merge) and implement 'merge ff' that performs a merge with fast forward preference, falling back to a merge commit only when necessary.
Tech stack
javascript
Domain
devops
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.
1-2 days
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Active
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
Git
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
60