更改：合并请求代码冲突提示语更改

app/services/pull_requests/merge_service.rb

@@ -24,6 +24,9 @@ class PullRequests::MergeService < ApplicationService
     result = Gitea::PullRequest::MergeService.call(@current_user.gitea_token, @owner.login,
       @repo.identifier, @pull.gitea_number, gitea_merge_pull_params)
       @status, @message = result
+      if @status.to_i == 409 
+        @message = "代码冲突，请重新提交合并请求"
+      end
   end
 
   def gitea_merge_pull_params