summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-02-24 05:27:58 -0600
committerJeff Carr <[email protected]>2024-02-24 05:27:58 -0600
commitccee5733641f6d3fac60a825203c0a59cd36e9a6 (patch)
tree1c5c452ad25c1f7d6e8e1c0861cb50c1fdfae6b9 /merge.go
parentddd95e9afc926d9e0a4a372dbf433d81c3db3207 (diff)
report dirty state change
Signed-off-by: Jeff Carr <[email protected]>
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/merge.go b/merge.go
index 559c5af..48d99fd 100644
--- a/merge.go
+++ b/merge.go
@@ -16,6 +16,16 @@ func (rs *RepoStatus) IsUserBranch() bool {
return false
}
+func (rs *RepoStatus) DeleteUserBranch(force bool) bool {
+ log.Log(REPOWARN, "figure out what to do here")
+ return false
+}
+
+func (rs *RepoStatus) ResetBranches() bool {
+ log.Log(REPOWARN, "figure out what to do here")
+ return false
+}
+
func (rs *RepoStatus) MergeUserToDevel() bool {
startbranch := rs.GetCurrentBranchName()
devel := rs.GetDevelBranchName()