File tree Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Expand file tree Collapse file tree 1 file changed +1
-1
lines changed Original file line number Diff line number Diff line change @@ -1045,7 +1045,7 @@ pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff)
10451045pulls.squash_merge_pull_request = Squash and Merge
10461046pulls.invalid_merge_option = You cannot use this merge option for this pull request.
10471047pulls.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
10491049pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
10501050pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
10511051pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
You can’t perform that action at this time.
0 commit comments