You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: options/locale/locale_en-US.ini
+1Lines changed: 1 addition & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -872,6 +872,7 @@ pulls.has_merged = The pull request has been merged.
872
872
pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.`
873
873
pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress. Remove the <strong>%s</strong> prefix from the title when it's ready
874
874
pulls.data_broken = This pull request is broken due to missing fork information.
875
+
pulls.files_conflicted = This pull request has changes conflicting with the target branch.
875
876
pulls.is_checking = "Merge conflict checking is in progress. Try again in few moments."
876
877
pulls.blocked_by_approvals = "This Pull Request doesn't have enough approvals yet. %d of %d approvals granted."
877
878
pulls.can_auto_merge_desc = This pull request can be merged automatically.
0 commit comments