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

Previous Next

Package: guix-patches;

Reported by: EuAndreh <eu <at> euandre.org>

Date: Wed, 27 Jan 2021 23:43:02 UTC

Severity: normal

Tags: patch

Done: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: EuAndreh <eu <at> euandre.org>
To: mail <at> nicolasgoaziou.fr, 46146 <at> debbugs.gnu.org
Cc: , 46146-done <at> debbugs.gnu.org
Subject: [bug#46146] [PATCH 0/3] Add mdpo and dependencies
Date: Wed, 03 Feb 2021 09:06:54 -0300

> 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?
This bug report was last modified 4 years and 112 days ago.

Previous Next

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