improvements

lunny · lunny · commit c04fb8613e01 · 2025-09-24T23:48:31.000-07:00
diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -292,10 +292,8 @@ func ChangeTargetBranch(ctx context.Context, pr *issues_model.PullRequest, doer
 			return err
 		}
 
-		if !pr.HasMerged {
-			if err = syncCommitDivergence(ctx, pr); err != nil {
-				return fmt.Errorf("syncCommitDivergence: %w", err)
-			}
+		if err = syncCommitDivergence(ctx, pr); err != nil {
+			return fmt.Errorf("syncCommitDivergence: %w", err)
 		}
 
 		// Create comment

Original file line number	Diff line number	Diff line change
`@@ -292,10 +292,8 @@ func ChangeTargetBranch(ctx context.Context, pr *issues_model.PullRequest, doer`
`292`	`292`	`return err`
`293`	`293`	`}`
`294`	`294`
`295`		`- if !pr.HasMerged {`
`296`		`- if err = syncCommitDivergence(ctx, pr); err != nil {`
`297`		`- return fmt.Errorf("syncCommitDivergence: %w", err)`
`298`		`- }`
	`295`	`+ if err = syncCommitDivergence(ctx, pr); err != nil {`
	`296`	`+ return fmt.Errorf("syncCommitDivergence: %w", err)`
`299`	`297`	`}`
`300`	`298`
`301`	`299`	`// Create comment`