Skip to content

[Backport 3.33] Handle 204 no content for SingleImageLayer#3927

Merged
sebr72 merged 1 commit into3.33from
ghci/backport/3882-to-3.33
Jan 21, 2026
Merged

[Backport 3.33] Handle 204 no content for SingleImageLayer#3927
sebr72 merged 1 commit into3.33from
ghci/backport/3882-to-3.33

Conversation

@geo-ghci-int
Copy link
Copy Markdown
Contributor

@geo-ghci-int geo-ghci-int bot commented Jan 21, 2026

Backport of #3882 to 3.33

Error on cherry-picking: 8cb72df

To continue do:

git fetch && \
  git checkout ghci/backport/3882-to-3.33 && \
  git reset --hard HEAD^ && \
  git cherry-pick 8cb72dfd14270738e8651e46133e07f4095ae003

Resolve the conflict, then:

git add <file> && \
  git cherry-pick --continue

When all the conflicts are resolved, push the branch:

git push origin ghci/backport/3882-to-3.33 --force

@sebr72 sebr72 self-requested a review January 21, 2026 12:13
@sebr72 sebr72 force-pushed the ghci/backport/3882-to-3.33 branch from 85bbb08 to 177ca55 Compare January 21, 2026 18:16
@sebr72 sebr72 merged commit 8f1dd91 into 3.33 Jan 21, 2026
16 checks passed
@sebr72 sebr72 deleted the ghci/backport/3882-to-3.33 branch January 21, 2026 18:32
@geo-ghci-int geo-ghci-int bot added this to the 3.33.10 milestone Feb 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sebr72 sebr72 sebr72 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

3.33.10

Development

Successfully merging this pull request may close these issues.

2 participants

@sebr72 @arnaudboudier-sogelink