From 0f79ad2f88986aad465975ff38238f3f49508076 Mon Sep 17 00:00:00 2001 From: Pyxy Date: Fri, 30 Aug 2024 23:01:14 +0800 Subject: [PATCH] p2 --- p2/validate.go | 9 +++++++++ validate/validate.go | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 p2/validate.go diff --git a/p2/validate.go b/p2/validate.go new file mode 100644 index 0000000..7bbea16 --- /dev/null +++ b/p2/validate.go @@ -0,0 +1,9 @@ +package p2 + +import ( + "errors" +) + +func Validate() error { + return errors.New("p2 error") +} diff --git a/validate/validate.go b/validate/validate.go index bcf6193..38476f3 100644 --- a/validate/validate.go +++ b/validate/validate.go @@ -1,13 +1,16 @@ package validate -import "errors" +import ( + "errors" + "test-merge/p2" +) func Validate(myType string) error { switch myType { case "1": return nil case "2": - return nil + return p2.Validate() case "3": return errors.New("branch1 error") } -- Gitee