yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

This commit is contained in:
qyzh 2021-12-22 17:39:22 +08:00
parent ce5b6a67bf 88b96565d1
commit 13263a44e4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/compare_controller.rb
View File

@ -29,6 +29,7 @@ class CompareController < ApplicationController
# if @compare_result["Commits"].blank? && @compare_result["Diff"].blank? # if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
# return -2, "分支内容相同，无需创建合并请求" # return -2, "分支内容相同，无需创建合并请求"
# end # end
puts "``````````", @base, @head
if @base == @head if @base == @head
return -2, "请选择不同分支" return -2, "请选择不同分支"
end end