From e9b23d65774773aa91301e35887e470de317bf16 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 19 Oct 2022 16:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/pull_requests/merge_service.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/services/pull_requests/merge_service.rb b/app/services/pull_requests/merge_service.rb
index 463412120..cffaebd8b 100644
--- a/app/services/pull_requests/merge_service.rb
+++ b/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