diff options
| author | Jeff Carr <[email protected]> | 2025-09-05 01:59:00 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-09-05 01:59:00 -0500 |
| commit | 809dfe7fa33fd3a29041d9073833aa6ae5e0ebce (patch) | |
| tree | 4dcb9e3c90069673cb91631d2a7d6ea1585e22ce | |
| parent | 04028e61817ccc8b3c33976aedbf1ada2736eb10 (diff) | |
more patch tracking
| -rw-r--r-- | doMerge.go | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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") |
