From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <boyarsh@altlinux.org>
Date: Mon, 6 Dec 2021 13:31:21 +0300
From: "Anton V. Boyarshinov" <boyarsh@altlinux.org>
To: Alexey Sheplyakov <asheplyakov@basealt.ru>
Message-ID: <20211206133121.5340bcd7@tower>
In-Reply-To: <b93971a7-ebbe-7116-301c-a35d20d9662f@basealt.ru>
References: <CAK42-GrMmjWKDLEjwa0anqok0B_6xK-B7=91A4EwXLr3=kMftg@mail.gmail.com>
 <20211206104252.590931a0@t14.localdomain>
 <b93971a7-ebbe-7116-301c-a35d20d9662f@basealt.ru>
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: 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:31:22 -0000
Archived-At: <http://lore.altlinux.org/devel/20211206133121.5340bcd7@tower/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

=D0=92 Mon, 6 Dec 2021 14:26:51 +0400
Alexey Sheplyakov <asheplyakov@basealt.ru> =D0=BF=D0=B8=D1=88=D0=B5=D1=82:

> > =D0=AD=D1=82=D0=BE=D1=82 =D0=BF=D0=BE=D0=B4=D1=85=D0=BE=D0=B4 =D0=BB=D0=
=BE=D0=BC=D0=B0=D0=B5=D1=82 =D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D1=8E git.=
 =D0=97=D0=B0=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=BE=D0=B2=D0=B0=D1=82=
=D1=8C =D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D1=83 =D0=BF=D1=80=D0=BE=D0=B2=D0=B5=
=D1=80=D0=BA=D0=B8 =D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8,
> > =D0=BA=D0=BE=D0=BD=D0=B5=D1=87=D0=BD=D0=BE, =D0=BD=D0=B5=D1=81=D0=BB=D0=
=BE=D0=B6=D0=BD=D0=BE, =D0=BD=D0=BE =D0=B2 =D1=80=D0=B5=D0=B7=D1=83=D0=BB=
=D1=8C=D1=82=D0=B0=D1=82=D0=B5 =D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=
=D1=8C =D1=81 =D1=8D=D1=82=D0=BE=D0=B9 =D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=
=D0=B5=D0=B9 =D0=B1=D1=83=D0=B4=D0=B5=D1=82 =D0=BE=D1=87=D0=B5=D0=BD=D1=8C
> > =D1=81=D0=BB=D0=BE=D0=B6=D0=BD=D0=BE. =20
>=20
> =D0=9E=D1=82=D0=BC=D0=B5=D0=BD=D1=8F=D1=82=D1=8C =D0=BF=D1=80=D0=BE=D0=B2=
=D0=B5=D1=80=D0=BA=D1=83 =D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8 =D0=BD=
=D0=B5 =D0=BD=D1=83=D0=B6=D0=BD=D0=BE.

=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.