From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <boyarsh@altlinux.org>
Date: Mon, 6 Dec 2021 13:55:43 +0300
From: "Anton V. Boyarshinov" <boyarsh@altlinux.org>
To: Aleksey Novodvorsky <aen@basealt.ru>
Message-ID: <20211206135543.3c3dc962@tower>
In-Reply-To: <CAGvFrt2Bv=A1Y=0w1q3mT7oivKXzsPxfv3LSVKm2UuEJzcsD+A@mail.gmail.com>
References: <CAK42-GrMmjWKDLEjwa0anqok0B_6xK-B7=91A4EwXLr3=kMftg@mail.gmail.com>
 <20211206104252.590931a0@t14.localdomain>
 <b93971a7-ebbe-7116-301c-a35d20d9662f@basealt.ru>
 <20211206133121.5340bcd7@tower>
 <CAGvFrt2Bv=A1Y=0w1q3mT7oivKXzsPxfv3LSVKm2UuEJzcsD+A@mail.gmail.com>
Organization: ALT Linux
X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-alt-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Cc: Alexey Sheplyakov <asheplyakov@basealt.ru>,
 ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] =?utf-8?b?0J3QvtCy0LDRjyDRgdGF0LXQvNCwINCy0LXQtNC10L0=?=
 =?utf-8?b?0LjRjyDQuNGB0YXQvtC00L3QuNC60L7QsiDRj9C00YDQsA==?=
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
 <mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Dec 2021 10:55:44 -0000
Archived-At: <http://lore.altlinux.org/devel/20211206135543.3c3dc962@tower/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

=D0=92 Mon, 6 Dec 2021 13:40:39 +0300
Aleksey Novodvorsky <aen@basealt.ru> =D0=BF=D0=B8=D1=88=D0=B5=D1=82:

> > =D0=A7=D0=B5=D1=80=D0=B5=D0=B7 git merge -s ours? =D0=9D=D0=B0 =D0=BC=
=D0=BE=D0=B9 =D0=B2=D0=B7=D0=B3=D0=BB=D1=8F=D0=B4, =D1=82=D0=BE, =D1=87=D1=
=82=D0=BE =D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D1=82=D1=81=D1=8F, =D0=BC=D0=
=BE=D0=B6=D0=BD=D0=BE
> > =D0=BD=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C =D0=B8=D1=81=D1=82=D0=
=BE=D1=80=D0=B8=D0=B5=D0=B9 =D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE =D0=BE=D1=
=87=D0=B5=D0=BD=D1=8C =D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=BD=D0=BE.
> > =20
>=20
> =D0=90 =D0=B5=D1=81=D1=82=D1=8C =D0=BB=D0=B8 =D0=BF=D1=80=D0=B5=D0=B4=D0=
=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F =D0=BF=D0=BE =D1=80=D0=B5=D1=88=D0=
=B5=D0=BD=D0=B8=D1=8E?
> =D0=92=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D1=8B, =D0=BF=D0=BE=D1=81=D1=82=D0=
=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5 =D0=90=D0=BB=D0=B5=D0=BA=D1=
=81=D0=B5=D0=B5=D0=BC =D0=BF=D0=BE =D0=B2=D0=B7=D0=B0=D0=B8=D0=BC=D0=BE=D0=
=B4=D0=B5=D0=B9=D1=81=D1=82=D0=B2=D0=B8=D1=8E =D1=81 =D0=BF=D0=B0=D1=80=D1=
=82=D0=BD=D1=91=D1=80=D0=B0=D0=BC=D0=B8, =D0=B2=D0=B0=D0=B6=D0=BD=D1=8B=D0=
=B5.

=D0=9C=D0=BD=D0=B5 =D0=BA=D0=B0=D0=B6=D0=B5=D1=82=D1=81=D1=8F, =D1=87=D1=82=
=D0=BE =D1=81=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0 =D0=BD=D0=B0=D0=BC =D0=BD=
=D0=B0=D0=B4=D0=BE =D1=81=D1=84=D0=BE=D1=80=D0=BC=D1=83=D0=BB=D0=B8=D1=80=
=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D1=83. =D0=98=
 =D0=BC=D0=BD=D0=B5 =D0=BD=D0=B5
=D0=BA=D0=B0=D0=B6=D0=B5=D1=82=D1=81=D1=8F, =D1=87=D1=82=D0=BE =D0=B4=D0=B8=
=D1=81=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B5 =
=D1=8F=D0=B4=D1=80=D0=BE =D0=B8 =D0=B2=D0=B5=D1=82=D0=BA=D0=B0 =D0=B4=D0=BB=
=D1=8F =D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8 =D0=B8
=D0=B2=D0=B7=D0=B0=D0=B8=D0=BC=D0=BE=D0=B4=D0=B5=D0=B9=D1=81=D1=82=D0=B2=D0=
=B8=D1=8F =D1=81 =D0=BF=D0=B0=D1=80=D1=82=D0=BD=D1=91=D1=80=D0=B0=D0=BC=D0=
=B8 =D0=BF=D0=BE =D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=
=B5 =D0=B4=D0=BE=D0=BB=D0=B6=D0=BD=D1=8B =D0=B1=D1=8B=D1=82=D1=8C =D0=BE=D0=
=B4=D0=BD=D0=BE=D0=B9 =D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=
=8E.