[Localization] Dear Qt Team, I would like to contribute the translation of "Chinese (Taiwan)" to Qt/QtCreator.

Haowei Hsu hwhsu1231 at gmail.com
Mon Mar 20 04:23:06 CET 2023


>
> >   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.


About the 3 and 4, shouldn't I wait for the Review Request passing the
review, and then solve the its conflicts?

---
Haowei Hsu

Oswald Buddenhagen <oswald.buddenhagen at gmx.de> 於 2023年3月20日 週一 上午1:27寫道:

> 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.
> _______________________________________________
> Localization mailing list
> Localization at qt-project.org
> https://lists.qt-project.org/listinfo/localization
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/localization/attachments/20230320/a7f33a1c/attachment.htm>


More information about the Localization mailing list