From 809dfe7fa33fd3a29041d9073833aa6ae5e0ebce Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 5 Sep 2025 01:59:00 -0500 Subject: [PATCH] more patch tracking --- doMerge.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doMerge.go b/doMerge.go index 2005d70..5f0d7d9 100644 --- a/doMerge.go +++ b/doMerge.go @@ -25,6 +25,11 @@ func doMergeDevel() (*gitpb.Repos, error) { err = fmt.Errorf("checkout devel failed") break } + // hash differences when merging user into devel branch + out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName()) + for i, hash := range out { + log.Info("MERGE HASH FROM USER TO DEVEL", i, hash) + } if _, err := repo.MergeToDevel(); err != nil { log.Info("merge from user failed", repo.GetGoPath(), err) err = fmt.Errorf("merge from user failed")