diff options
| author | Ing. Jaroslav Šafka <devel@safka.org> | 2022-07-13 10:22:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 16:22:51 +0800 |
| commit | 8420c1bf4c46a59973d30af5114216918d0f60cd (patch) | |
| tree | ecbc9df280a2be760f6d37853d78c62997af5fe0 /options | |
| parent | b7c6ec91bac5ab0a5382f99a72753574dbc41745 (diff) | |
| download | gitea-8420c1bf4c46a59973d30af5114216918d0f60cd.tar.gz gitea-8420c1bf4c46a59973d30af5114216918d0f60cd.zip | |
Fix checks in PR for empty commits #19603 (#20290)
* Fixes issue #19603 (Not able to merge commit in PR when branches content is same, but different commit id)
* fill HeadCommitID in PullRequest
* compare real commits ID as check for merging
* based on @zeripath patch in #19738
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9b69d54593..9e8a030339 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1532,7 +1532,8 @@ pulls.remove_prefix = Remove <strong>%s</strong> prefix 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.is_empty = "This branch is equal with the target branch." +pulls.is_ancestor = "This branch is already included in the target branch. There is nothing to merge." +pulls.is_empty = "The changes on this branch are already on the target branch. This will be an empty commit." pulls.required_status_check_failed = Some required checks were not successful. pulls.required_status_check_missing = Some required checks are missing. pulls.required_status_check_administrator = As an administrator, you may still merge this pull request. |