diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-02-05 19:54:49 +0800 |
|---|---|---|
| committer | techknowlogick <matti@mdranta.net> | 2019-02-05 06:54:49 -0500 |
| commit | bf4badad1d68c18d7ffb92c69e09e4e8aa252935 (patch) | |
| tree | 9e8c3a41eba604738e632d921a2de97334e35e03 /options | |
| parent | 680a57ce921f6d8c8752fa27aad6c95865fe8127 (diff) | |
| download | gitea-bf4badad1d68c18d7ffb92c69e09e4e8aa252935.tar.gz gitea-bf4badad1d68c18d7ffb92c69e09e4e8aa252935.zip | |
Pull request conflict files detection (#5951)
* add conflict detection
* test pull request conflict files
* fix detection files number
* fix comments
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 502b980c43..f83ad15b3a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -872,6 +872,7 @@ pulls.has_merged = The pull request has been merged. pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.` 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 pulls.data_broken = This pull request is broken due to missing fork information. +pulls.files_conflicted = This pull request has changes conflicting with the target branch. pulls.is_checking = "Merge conflict checking is in progress. Try again in few moments." pulls.blocked_by_approvals = "This Pull Request doesn't have enough approvals yet. %d of %d approvals granted." pulls.can_auto_merge_desc = This pull request can be merged automatically. |