[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#46146] [PATCH 0/3] Add mdpo and dependencies
|
From: |
Nicolas Goaziou |
|
Subject: |
[bug#46146] [PATCH 0/3] Add mdpo and dependencies |
|
Date: |
Wed, 03 Feb 2021 13:27:47 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) |
Hello,
EuAndreh <eu@euandre.org> writes:
>> I fixed some merge conflicts (please avoid adding new packages at the
>> end of a file, unless it it is their "natural" place), updated mdpo to
>> 0.3.6 and pushed.
>
> How can I best avoid this type of merge conflict in the future? Is
> picking a random-ish position on the file a good solution?
Yes, that or alphabetically. It depends on the structure of the file.
Exception is packages inheriting from another package, which must be
located after the latter.
Regards,
--
Nicolas Goaziou