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")