Skip to content

Commit 28e2817

Browse files
fix(forgejo): describe fast-forward merges accurately
AI-assisted; verified with the tests and tools listed above.
1 parent d673857 commit 28e2817

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎apps/mobile/src/features/pull-requests/pullRequestActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const MERGE_METHODS = {
3535
rebase: { title: "Rebase and merge", description: "Add the commits without a merge commit." },
3636
"fast-forward": {
3737
title: "Fast-forward merge",
38-
description: "Add the commits as they are, only if the base has not moved.",
38+
description: "Add the commits as they are. Needs the branch to contain the base.",
3939
},
4040
} as const satisfies Record<PullRequestMergeMethod, { title: string; description: string }>;
4141

‎packages/contracts/src/pullRequest.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export type PullRequestChecksState = typeof PullRequestChecksState.Type;
5454
export const PullRequestMergeability = Schema.Literals(["mergeable", "conflicting", "unknown"]);
5555
export type PullRequestMergeability = typeof PullRequestMergeability.Type;
5656

57-
/** `fast-forward` refuses when the base has moved, where `rebase` rewrites the branch onto it. */
57+
/** `fast-forward` refuses unless the head contains the base, where `rebase` rewrites the branch onto it. */
5858
export const PullRequestMergeMethod = Schema.Literals([
5959
"merge",
6060
"squash",

0 commit comments

Comments
 (0)