Skip to content

Conversation

@Turab
Copy link
Contributor

@Turab Turab commented Dec 4, 2025

It was staged for version 1.7.0 before, now it is re-based to staging/1.6.1 including the typos fixes.

I wonder something: Since main branch has some typos from my previously merged PR, how will this effect the later versions like 1.7.0? Will this new PR be cherry-picked into main or the later staging branches (like staging/1.7.0 for example)?

Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

Overall looks pretty good - just a few lines that should be swapped around to maintain alphabetical order.

Thanks!

@necouchman
Copy link
Contributor

I wonder something: Since main branch has some typos from my previously merged PR, how will this effect the later versions like 1.7.0? Will this new PR be cherry-picked into main or the later staging branches (like staging/1.7.0 for example)?

This will get merged up to patch, main, and next branches, so it should take care of any of those issues. Then, when we go to do a 1.7.0 release, we'll create the staging/1.7.0 branch from the main branch, and it should include all of these fixes.

@Turab Turab force-pushed the tr-translation-1.6.1 branch from 7fbbb71 to 325bc65 Compare December 5, 2025 06:57
@Turab
Copy link
Contributor Author

Turab commented Dec 5, 2025

Overall looks pretty good - just a few lines that should be swapped around to maintain alphabetical order.

Thanks!

Done! They were mere copies of en.json files, but nonetheless, I re-ordered the aforementioned keys. As you told before, if I come across some more in later versions, I will alter the ordering despite their positioning in en.json files.

@Turab Turab requested a review from necouchman December 5, 2025 07:01
@necouchman necouchman merged commit 350138c into apache:staging/1.6.1 Dec 6, 2025
1 check passed
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