all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: EuAndreh <eu@euandre.org>
Cc: 46146-done@debbugs.gnu.org, 46146@debbugs.gnu.org
Subject: [bug#46146] [PATCH 0/3] Add mdpo and dependencies
Date: Wed, 03 Feb 2021 13:27:47 +0100	[thread overview]
Message-ID: <875z39l4jg.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <87bld11hk1.fsf@euandre.org> (EuAndreh's message of "Wed, 03 Feb 2021 09:06:54 -0300")

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




  reply	other threads:[~2021-02-03 12:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-27 23:42 [bug#46146] [PATCH 0/3] Add mdpo and dependencies guix-patches--- via
2021-01-27 23:44 ` [bug#46146] [PATCH 1/3] gnu: Add md4c guix-patches--- via
2021-01-27 23:44   ` [bug#46146] [PATCH 2/3] gnu: Add python-pymd4c guix-patches--- via
2021-01-27 23:44   ` [bug#46146] [PATCH 3/3] gnu: Add mdpo guix-patches--- via
2021-02-02  9:30 ` bug#46146: [PATCH 0/3] Add mdpo and dependencies Nicolas Goaziou
2021-02-03 12:06   ` [bug#46146] " guix-patches--- via
2021-02-03 12:27     ` Nicolas Goaziou [this message]
2021-02-03 19:15       ` guix-patches--- via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=875z39l4jg.fsf@nicolasgoaziou.fr \
    --to=mail@nicolasgoaziou.fr \
    --cc=46146-done@debbugs.gnu.org \
    --cc=46146@debbugs.gnu.org \
    --cc=eu@euandre.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.