diff --git a/LICENSE b/LICENSE index 2b9b385e..04a210b9 100644 --- a/LICENSE +++ b/LICENSE @@ -121,4 +121,4 @@ You may obtain a copy of Mulan PSL v2 at: THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. -See the Mulan PSL v2 for more details. \ No newline at end of file +See the Mulan PSL v2 for more details. diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb index 4027b0f5..99c8ddbf 100644 --- a/app/controllers/compare_controller.rb +++ b/app/controllers/compare_controller.rb @@ -29,6 +29,7 @@ class CompareController < ApplicationController # if @compare_result["Commits"].blank? && @compare_result["Diff"].blank? # return -2, "分支内容相同,无需创建合并请求" # end + puts "``````````", @base, @head if @base == @head return -2, "请选择不同分支" end