Revert "improvements"

lunny · lunny · commit d7bda6b5f83d · 2025-09-24T23:59:25.000-07:00
This reverts commit c04fb86.
diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -292,8 +292,10 @@ func ChangeTargetBranch(ctx context.Context, pr *issues_model.PullRequest, doer
 			return err
 		}
 
-		if err = syncCommitDivergence(ctx, pr); err != nil {
-			return fmt.Errorf("syncCommitDivergence: %w", err)
+		if !pr.HasMerged {
+			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,8 +292,10 @@ func ChangeTargetBranch(ctx context.Context, pr *issues_model.PullRequest, doer`
`292`	`292`	`return err`
`293`	`293`	`}`
`294`	`294`
`295`		`- if err = syncCommitDivergence(ctx, pr); err != nil {`
`296`		`- return fmt.Errorf("syncCommitDivergence: %w", err)`
	`295`	`+ if !pr.HasMerged {`
	`296`	`+ if err = syncCommitDivergence(ctx, pr); err != nil {`
	`297`	`+ return fmt.Errorf("syncCommitDivergence: %w", err)`
	`298`	`+ }`
`297`	`299`	`}`
`298`	`300`
`299`	`301`	`// Create comment`