From 6c08cc5bcb45803848ecaca678a086f962e0ccb2 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 10 Nov 2024 12:03:16 -0800
Subject: [PATCH] don't return error even retargetbranch of pull request failed

---
 services/repository/push.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/repository/push.go b/services/repository/push.go
index e18c6685e3..57cba042de 100644
--- a/services/repository/push.go
+++ b/services/repository/push.go
@@ -278,7 +278,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
 
 				if setting.Repository.PullRequest.RetargetChildrenOnMerge {
 					if err := pull_service.RetargetBranchPulls(ctx, pusher, repo.ID, branch, repo.DefaultBranch); err != nil {
-						return err
+						log.Error("retargetBranchPulls failed: %v", err)
 					}
 				}