On 2023/7/15 03:07, Jonathan Corbet wrote:
> Hu Haowen <[email protected]> writes:
>
>> Update zh_TW's index.rst to the version of commit 0c7b4366f1ab ("docs:
>> Rewrite the front page") with some reference from commit f4bf1cd4ac9c
>> ("docs: move asm-annotations.rst into core-api") and commit eef24f7054a6
>> ("docs/zh_CN: Rewrite the Chinese translation front page").
>>
>> Signed-off-by: Hu Haowen <[email protected]>
>> ---
>> Documentation/translations/zh_TW/index.rst | 156 ++++++++-------------
>> 1 file changed, 56 insertions(+), 100 deletions(-)
>
> So your two patches conflict with each other. I've sorted it out and
> applied this, but it would be nicer if I didn't have to do that...
Sorry for bothering you. The conflict might be caused by my attempting
to split the patches belonged to one ensemble originally into two
independent parts. Only after sending the first one patch did I recall
remaining some work which was supposed to be patched and sent together
with the former. But that was late.
The next time I will check if my work is done wholly before sending and
send the patches altogether so as to ensure that they won't cause any
conflicts. Apologies to you again.
Thanks,
Hu
>
> Thanks,
>
> jon