ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-16 01:43:24 +09:00
Code Issues Projects Releases Wiki Activity

fix(pull): keep the merged state in sync with git (#39062) (#39118)

Browse Source 
Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: bircni <bircni@icloud.com>
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
wxiaoguang
2026-08-25 17:33:09 +00:00
committed by GitHub
co-authored by bircni silverwind
parent 3af1ee88a5
commit b70f7aeda1
7 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/repository/merge_upstream.go
+1 -1
View File
@@ -88,7 +88,7 @@ func MergeUpstream(ctx reqctx.RequestContext, doer *user_model.User, repo *repo_
BaseBranch: divergingInfo.BaseBranchName,
}
fakeIssue.PullRequest = fakePR
err = pull.Update(ctx, fakePR, doer, "merge upstream", false)
err = pull.Update(fakePR, doer, "merge upstream", false)
if err != nil {
return "", err
}