diff options
| author | Jeff Carr <[email protected]> | 2025-01-08 03:13:09 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-01-08 03:13:09 -0600 |
| commit | b0fca659c57dd2cb6a88a74d1a349117a3908124 (patch) | |
| tree | d1e43473858cead9872a4652aaaeed85dd2afd38 /repo.merge.go | |
| parent | ebda2ea222ed9f1d348d5d3e0cffb9c9f9c0acec (diff) | |
fix the dumb names
Diffstat (limited to 'repo.merge.go')
| -rw-r--r-- | repo.merge.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/repo.merge.go b/repo.merge.go index 9507459..6dbb35e 100644 --- a/repo.merge.go +++ b/repo.merge.go @@ -18,7 +18,7 @@ func (rs *Repo) MergeUserToDevel() (*cmd.Status, error) { all = append(all, []string{"git", "push"}) if result, err := rs.RunStrictAll(all); err != nil { - log.Log(GITPBWARN, "MergeUserToDevel() failed", rs.GetFullPath()) + log.Log(WARN, "MergeUserToDevel() failed", rs.GetFullPath()) return result, err } return nil, nil @@ -37,7 +37,7 @@ func (rs *Repo) MergeDevelToMaster() (*cmd.Status, error) { all = append(all, []string{"git", "push"}) if result, err := rs.RunStrictAll(all); err != nil { - log.Log(GITPBWARN, "MergeDevelToMaster() failed", rs.GetFullPath()) + log.Log(WARN, "MergeDevelToMaster() failed", rs.GetFullPath()) return result, err } return nil, nil |