git-workflow/autogits
SHA256
20
0
Fork 9
Code Issues 44 Pull Requests 6 Projects 2 Activity

pr: error format fix

Browse Source
This commit is contained in:
Adam Majer
2025-08-26 23:50:48 +02:00
parent e0c7ea44ea
commit 46a187a60e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-pr/pr_processor.go
View File

@@ -249,7 +249,7 @@ func (pr *PRProcessor) RebaseAndSkipSubmoduleCommits(prset *common.PRSet, branch
for _, s := range statuses { for _, s := range statuses {
if s.SubmoduleChanges != "S..." { if s.SubmoduleChanges != "S..." {
git.GitExecOrPanic(common.DefaultGitPrj, "rebase", "--abort") git.GitExecOrPanic(common.DefaultGitPrj, "rebase", "--abort")
return fmt.Errorf("Unexpected conflict in rebase. %s", s) return fmt.Errorf("Unexpected conflict in rebase. %v", s)
} }
} }
conflict = git.GitExec(common.DefaultGitPrj, "rebase", "--skip") conflict = git.GitExec(common.DefaultGitPrj, "rebase", "--skip")