Need to rebase all dev-xx (branch for l10n) with main

[seokho-son]

Hello, this issue is from the maintainers.

Since there are several major changes that affect to development branches for localization (Tags for terms, Deprecated terms, Labeler workflow), all localization branches (dev-xx) needs to be updated.

This is an action item to all localization teams. (especially for the members who are managing development branch itself)

Let me check all localization branches are updated.

• dev-ko
• dev-bn
• dev-hi
• dev-es
• dev-fr
• dev-pt
• dev-zh
• dev-it
• dev-de
• dev-ur
• dev-ar

Please note that there is a target date to complete this issue. After the target date, some PRs to a dev-xx branch which is not updated can face Some checks were not successful.

Target date: Feb. 12

[seokho-son]

#1682 is an example to update a dev-xx branch.

[seokho-son]

Not mandatory in case of dev-es, dev-pt which have been updated recently. ;)

[iamNoah1]

Here is the PR for rebasing dev-de with main: #1686

[shivaabhishek07]

Hey, I would like to work on this issue for dev-hi branch. I know how make changes to that branch but I have been struck over pushing the content of the local branch to dev-hi branch. Can anyone guide me in solving this conflict?

[seokho-son]

shivaabhishek07

Hi @shivaabhishek07
I am not sure I understood your problem correctly.

• Do you want to push commits in your local branch to dev-hi branch of upstream (cncf/glossary) ? (it is not allowed in general. we need to open a PR for that)
• or.. your problem is that you can not push commits in your local branch to dev-hi branch of your remote repository (shivaabhishek07/glossary) because of any conflict?

[shivaabhishek07]

Hey @seokho-son, what you have understood is absolutely correct (first point).
Thanks for letting me know that I have to open a PR.

[shivaabhishek07]

Here it is for dev-hi #1690

[ugho16]

Hi @seokho-son, here is the PR for dev-it branch. If it's ok feel free to merge it, or give us your ok and we will do it
#1696

[seokho-son]

Complete ! Thanks all!