Skip to content

Conversation

@cosmo0920
Copy link
Contributor

Corresponding to fluent/fluent-bit#9468.

@cosmo0920
Copy link
Contributor Author

Hi,
I resolved conflicts by the recent changes of docs repo.

@cosmo0920 cosmo0920 force-pushed the cosmo0920-unicode.encoding-parameter-on-in_tail branch from d1ddc43 to ee6e4ff Compare July 7, 2025 08:23
@lecaros
Copy link
Contributor

lecaros commented Jul 7, 2025

@fluent/chronosphere-tech-writers could you please review this one? Thanks in advance!

Copy link
Member

@alexakreizinger alexakreizinger left a comment

Choose a reason for hiding this comment

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

suggested some changes for style, but adding my approval based on those 😁 happy to take another look if you need to make changes to any of my changes, too

@cosmo0920 cosmo0920 force-pushed the cosmo0920-unicode.encoding-parameter-on-in_tail branch from c3c1e45 to 162cbd9 Compare July 8, 2025 03:09
@eschabell
Copy link
Collaborator

@cosmo0920 if you can resolve these conflicts, I'll get this merged so we can merge #1870

@eschabell eschabell self-assigned this Oct 21, 2025
@eschabell eschabell added conflict Waiting on conflict to be resolved by contributor waiting-for-user Waiting for user/contributors feedback or requested changes and removed waiting-on-code-merge labels Oct 21, 2025
cosmo0920 and others added 2 commits October 22, 2025 16:43
Co-authored-by: Alexa Kreizinger <[email protected]>
Signed-off-by: Hiroshi Hatake <[email protected]>
@cosmo0920 cosmo0920 force-pushed the cosmo0920-unicode.encoding-parameter-on-in_tail branch from 162cbd9 to cbfe1e9 Compare October 22, 2025 07:44
@eschabell eschabell removed waiting-for-user Waiting for user/contributors feedback or requested changes conflict Waiting on conflict to be resolved by contributor labels Oct 22, 2025
@eschabell
Copy link
Collaborator

Thanks @cosmo0920 for the resolution, merging!

@eschabell eschabell merged commit a2f11a0 into master Oct 22, 2025
7 checks passed
@eschabell eschabell deleted the cosmo0920-unicode.encoding-parameter-on-in_tail branch October 22, 2025 12:29
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.

4 participants