GNU bug report logs - #46146
[PATCH 0/3] Add mdpo and dependencies

Previous Next

Full log

View this message in rfc822 format

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: EuAndreh <eu <at> euandre.org>
Cc: 46146-done <at> debbugs.gnu.org, 46146 <at> debbugs.gnu.org
Subject: [bug#46146] [PATCH 0/3] Add mdpo and dependencies
Date: Wed, 03 Feb 2021 13:27:47 +0100

Hello,

EuAndreh <eu <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.