Merge main into branch dev-ja

[Okabe-Junya]

Describe your changes

merge upstream/main into upstream/dev-ja

Background

There are several ways to merge the dev-ja branch into the main branch, but this has become complicated due to a number of PRs being created.

Currently, since main and dev-ja are conflicting, we cannot be merged directly. I think the easiest way to resolve this is to merge the main branch into dev-ja and then merge #2677.

Related issue number or link (ex: resolves #issue-number)

no issue related in this PR

Checklist before opening this PR (put x in the checkboxes)

• This PR does not contain plagiarism
  • don’t copy other people’s work unless you are quoting and contributing it to them.
• I have signed off on all commits
  • signing off (ex: git commit -s) is to affirm that commits comply DCO. If you are working locally, you could add an alias to your gitconfig by running git config --global alias.ci "commit -s".

[Okabe-Junya]

I think the easiest way to resolve the issue is to merge this PR instead of a rebase, and then merge #2677.

(And then, I believe we will be able to close #2695 and #2700.)

@seokho-son @jihoon-seo @naonishijima @kaitoii11

What do you think about this approach?

[jihoon-seo]

This looks good to me. Thank you @Okabe-Junya !

[Okabe-Junya]

It appears that there is a failure in the DCO check. Why might this be? How should this be resolved?... Executing the following commands might resolve the issue, but there could be side effects

git rebase HEAD~250 --signoff
git push --force-with-lease origin merge-main

[naonishijima]

@Okabe-Junya You can manually DCO on via Details.

[Okabe-Junya]

I think there are several problems with making DCO changes (following the instructions written in the details) in this PR.

1. It seems inappropriate to rewrite DCO that have already been done by others.
2. Changing the DCO might lead to conflicts again.
3. In other similar PRs, this problem does not appear to be happening.
   a. e.g. [es] Update dev-es with the latest changes of main #2689, Update 'dev-hi' branch with 'main' branch #2625

Therefore, I am hoping for this CI to pass, but...

[naonishijima]

@seokho-son @jihoon-seo Do you have any idea or advice to merge this PR?

[seokho-son]

Hello @Okabe-Junya,

I apologize for the delayed response due to personal circumstances.
Until now, all our localization teams have been updating the dev branch and resolving merge conflicts through rebase. We initially used rebase to provide a cleaner commit history, but I understand that it can sometimes become quite complicated. Usually, we try to avoid simultaneous modifications to the same files in both dev and main branches. However, conflicts often arise during initial live tasks, especially with config.toml.

Reflecting on it now, it seems that resolving merge conflicts through rebase might not always be necessary. I will go through a brief review and confirmation process with the other maintainers regarding this matter and then proceed with handling this PR.

Regarding the DCO issue, since the problematic commits originated not in the dev-ja branch but from the main branch, it looks like I'll have to manually pass them. You don't need to worry about this part.

[Okabe-Junya]

Thank you for your thoughtful response.

This issue seems a bit difficult. I respect the opinions of reviewers and other maintainers(of course, including you). if this PR is not necessary, I'm fine with closing it or creating another PR.

I hope this issue will be resolved successfully.

(It seems that there are not enough reviews from CODEOWNERS to merge this PR. Since @.kaitoii11 is not a CODEOWNER, it appears that there are not enough approvers.)

[seokho-son]

There are no objections from the maintainers, so I am going to merge the PR.
Thanks @Okabe-Junya @naonishijima @kaitoii11 :)

(@Okabe-Junya, regarding the reviews from CODEOWNERS, it's hard to get all approvals for special PRs like this, which do not require a code review. Maintainers use their authority (bypass branch protections) to merge these kinds of PRs.)