[Localization] Dear Qt Team, I would like to contribute the translation of "Chinese (Taiwan)" to Qt/QtCreator.
Oswald Buddenhagen
oswald.buddenhagen at gmx.de
Sun Mar 19 18:26:52 CET 2023
On Sun, Mar 19, 2023 at 11:09:31PM +0800, Haowei Hsu wrote:
>So far, I have opened a few Review Request waiting to be reviewed and
>merged.
>And I noticed that there are some conflicts between some of them.
>
> 1. *How to solve these conflicts? Rebase?*
>
cherry-pick them into the same branch and resolve the conflicts as you
go. then re-push them together.
you'll need to use `git rebase -i` if you need to fix the commits
subsequently.
> 3. *When should I solve these conflicts?*
>
now
> 4. *If one of them passes the review and is merged, what should I do to
> others?*
>
you'll need to merge them in order, at least the ones which have diff
dependencies.
More information about the Localization
mailing list