From 78049e664d7955df52d64aca3adc74b7539d1fa6 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 30 Jan 2024 13:31:46 -0600 Subject: merge automation Signed-off-by: Jeff Carr --- git.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git.go') diff --git a/git.go b/git.go index bbf7030..722a00c 100644 --- a/git.go +++ b/git.go @@ -279,8 +279,8 @@ func (rs *RepoStatus) GetStatus() string { if rs.userBranchVersion.String() != rs.develBranchVersion.String() { return "merge to devel" } - if rs.userBranchVersion.String() != rs.masterBranchVersion.String() { - return "ready to release" + if rs.develBranchVersion.String() != rs.masterBranchVersion.String() { + return "merge to main" } if rs.lasttag.String() != rs.masterBranchVersion.String() { return "ready to tag version" -- cgit v1.2.3