diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index b4003455..69d9e60b 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -182,7 +182,12 @@ class PullRequestsController < ApplicationController message: "在这些分支之间的合并请求已存在:#{can_merge.first.try(:title)}", } else - normal_status(0, "可以合并") + compare_result = Repositories::CompareService.call(@owner, @project, params) + if compare_result['Diff'].blank? + normal_status(0, "可以合并") + else + normal_status(-2, "分支内容相同,无需创建合并请求") + end end end end