Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return 409 when gc conflict #731

Merged
merged 3 commits into from
Dec 30, 2024
Merged

Return 409 when gc conflict #731

merged 3 commits into from
Dec 30, 2024

Conversation

feiniks
Copy link
Contributor

@feiniks feiniks commented Dec 23, 2024

No description provided.

var ErrConflict = fmt.Errorf("Concurent upload conflict")
var (
ErrConflict = errors.New("Concurent upload conflict")
ErrGCConflict = errors.New("GC Conflict")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同步的时候调用 fastForwardOrMerge 也需要给 GC Conflict 返回 409 错误。C 部分也要改一下。

@killing killing merged commit ee9ad5e into master Dec 30, 2024
6 checks passed
@killing killing deleted the gc_code branch December 30, 2024 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants