From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lav@altlinux.ru>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on
 sa.local.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
 autolearn_force=no version=3.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8;
 format=flowed
Content-Transfer-Encoding: quoted-printable
Date: Thu, 05 Nov 2020 00:21:41 +0300
From: Vitaly Lipatov <lav@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
User-Agent: Roundcube Webmail/1.4.9
Message-ID: <e477beb0442cce9470ba97503a3a1082@altlinux.ru>
X-Sender: lav@altlinux.ru
Organization: ALT Linux Team
Subject: [devel] =?utf-8?b?0J7QsdC90L7QstC70LXQvdC40LUg0L/QsNC60LXRgtCw?=
 =?utf-8?q?_=D1=81_refusing_to_merge_unrelated_histories?=
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: Wed, 04 Nov 2020 21:21:44 -0000
Archived-At: <http://lore.altlinux.org/devel/e477beb0442cce9470ba97503a3a1082@altlinux.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

=D0=9C=D0=BE=D0=B6=D0=B5=D1=82 =D0=BA=D1=82=D0=BE-=D0=BD=D0=B8=D0=B1=D1=83=
=D0=B4=D1=8C =D0=BF=D0=BE=D0=BC=D0=BE=D1=87=D1=8C =D1=81 =D0=BE=D0=B1=D0=BD=
=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC =D0=BF=D0=B0=D0=BA=D0=B5=
=D1=82=D0=B0 hypre =E2=80=94
=D0=BE=D0=B1=D1=8B=D1=87=D0=BD=D1=8B=D0=B9 merge =D0=B4=D0=BE =D1=82=D1=8D=
=D0=B3=D0=B0 v2.20.0 =D0=B7=D0=B0=D0=BA=D0=B0=D0=BD=D1=87=D0=B8=D0=B2=D0=B0=
=D0=B5=D1=82=D1=81=D1=8F refusing to merge unrelated=20
histories,
=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5
--allow-unrelated-histories
=D0=BF=D1=80=D0=B8=D0=B2=D0=BE=D0=B4=D0=B8=D1=82 =D0=BA =D0=BF=D0=BE=D1=8F=
=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8E =D0=B4=D0=B5=D1=81=D1=8F=D1=82=D0=BA=
=D0=BE=D0=B2 =D0=BA=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=BE=D0=B2 =
=D0=BC=D0=B5=D0=B6=D0=B4=D1=83 =D1=84=D0=B0=D0=B9=D0=BB=D0=B0=D0=BC=D0=B8
=D0=B0 =D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 -X thei=
rs =D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D1=91=D1=82 =D1=83=D1=81=D0=BF=D0=B5=D1=
=88=D0=BD=D1=8B=D0=B9 merge, =D0=BD=D0=BE =D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=
=B8 =D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2 =D0=B2 =D0=BD=D1=91=D0=BC=20
=D0=BD=D0=B5=D0=B8=D0=B7=D0=B2=D0=B5=D1=81=D1=82=D0=BD=D0=BE =D0=BE=D1=82=
=D0=BA=D1=83=D0=B4=D0=B0.

=D0=9E=D0=B1=D1=81=D1=83=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5 =D1=82=D0=BE=
=D0=B3=D0=BE, =D1=87=D1=82=D0=BE =D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C, =D0=
=B5=D1=81=D0=BB=D0=B8 =D0=B2 =D0=BF=D1=80=D0=BE=D1=82=D0=B8=D0=B2=D0=BE=D0=
=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C -s ours =D0=BD=D0=
=B5=D1=82 -s=20
theirs, =D0=B4=D0=BB=D0=B8=D1=82=D1=81=D1=8F =D0=B4=D0=BE=D0=B2=D0=BE=D0=BB=
=D1=8C=D0=BD=D0=BE =D0=B4=D0=BB=D0=B8=D0=BD=D0=BD=D0=BE.
https://stackoverflow.com/questions/173919/is-there-a-theirs-version-of-git=
-merge-s-ours

=D0=9A=D0=B0=D0=BA =D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE =
=D0=BF=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0=D1=82=D1=8C =D0=B2 =D1=82=D0=B0=
=D0=BA=D0=BE=D0=BC =D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5?

--=20
=D0=A1 =D1=83=D0=B2=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC,
=D0=92=D0=B8=D1=82=D0=B0=D0=BB=D0=B8=D0=B9 =D0=9B=D0=B8=D0=BF=D0=B0=D1=82=
=D0=BE=D0=B2,
ALT Linux Team