Skip to content

Commit 5a3af79

Browse files
kzmizeripath
authored andcommitted
fix placeholders in the error message (go-gitea#9060)
1 parent 9ccb50f commit 5a3af79

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

options/locale/locale_en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff)
10451045
pulls.squash_merge_pull_request = Squash and Merge
10461046
pulls.invalid_merge_option = You cannot use this merge option for this pull request.
10471047
pulls.merge_conflict = Merge Failed: There was a conflict whilst merging: %[1]s<br>%[2]s<br>Hint: Try a different strategy
1048-
pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %s[1]<br>%[1]s<br>%[2]s<br>Hint:Try a different strategy
1048+
pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %[1]s<br>%[2]s<br>%[3]s<br>Hint:Try a different strategy
10491049
pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
10501050
pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
10511051
pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`

0 commit comments

Comments
 (0)