Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Improve sync fork behavior (#33319)#33332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
lunny merged 2 commits intogo-gitea:release/v1.23fromwxiaoguang:backport-sync-fork
Jan 20, 2025

Conversation

@wxiaoguang
Copy link
Contributor

Backport#33319
Fix#33271

The only conflict isreqctx inservices/repository/merge_upstream.go, which could keep usingcontext.Context in 1.23

Fixgo-gitea#33271Suppose there is a `branch-a` in fork repo:1. if `branch-a` exists in base repo: try to sync `base:branch-a` to `fork:branch-a`2. if `branch-a` doesn't exist in base repo: try to sync `base:main` to `fork:branch-a`# Conflicts:#services/repository/merge_upstream.go
@GiteaBotGiteaBot added this to the1.23.2 milestoneJan 20, 2025
@GiteaBotGiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelJan 20, 2025
@github-actionsgithub-actionsbot added modifies/translation modifies/goPull requests that update Go code modifies/templatesThis PR modifies the template files labelsJan 20, 2025
@GiteaBotGiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelsJan 20, 2025
@GiteaBotGiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labelsJan 20, 2025
@lunnylunny added the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. labelJan 20, 2025
@lunnylunnyenabled auto-merge (squash)January 20, 2025 07:37
@lunnylunny merged commit8f45a11 intogo-gitea:release/v1.23Jan 20, 2025
26 checks passed
@GiteaBotGiteaBot removed the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. labelJan 20, 2025
@wxiaoguangwxiaoguang deleted the backport-sync-fork branchJanuary 20, 2025 07:52
@go-giteago-gitea locked asresolvedand limited conversation to collaboratorsApr 20, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.

Reviewers

@lunnylunnylunny approved these changes

+1 more reviewer

@Zettat123Zettat123Zettat123 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.modifies/goPull requests that update Go codemodifies/templatesThis PR modifies the template filesmodifies/translation

Projects

None yet

Milestone

1.23.2

Development

Successfully merging this pull request may close these issues.

4 participants

@wxiaoguang@lunny@Zettat123@GiteaBot
[8]ページ先頭
©2009-2025 Movatter.jp