From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=unavailable autolearn_force=no version=3.4.1 MIME-Version: 1.0 Date: Thu, 27 Jul 2023 14:40:40 +0300 From: Vitaly Lipatov To: ALT Linux Team development discussions In-Reply-To: References: <5b931cb3e73085097d16ebc6293aa04c@altlinux.ru> <90fbf646-888e-6257-11f2-63474c106137@basealt.ru> Message-ID: <821fe7d45e028a0f727e653a53ec5d34@altlinux.ru> X-Sender: lav@altlinux.ru Organization: ALT Linux Team Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Cc: Ivan Zakharyaschev , Nikolai Kostrigin Subject: Re: [devel] =?utf-8?b?0J7QsdC90L7QstC70LXQvdC40LUg0L/QsNC60LXRgtCw?= =?utf-8?b?INC40LcgdXBzdHJlYW0g0L3QsCDQv9GA0LjQvNC10YDQtSBweWJpbmQxMQ==?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2023 11:40:44 -0000 Archived-At: List-Archive: List-Post: Ivan Zakharyaschev =D0=BF=D0=B8=D1=81=D0=B0=D0=BB(=D0=B0) 27.7.23 12:18: > =D0=97=D0=B4=D1=80=D0=B0=D0=B2=D1=81=D1=82=D0=B2=D1=83=D0=B9=D1=82=D0=B5! >=20 > On Thu, 27 Jul 2023, Nikolai Kostrigin wrote: >=20 >> 27.07.2023 06:58, Ivan A. Melnikov =D0=BF=D0=B8=D1=88=D0=B5=D1=82: =2E.. >> > =D0=9A=D0=B0=D0=BA =D1=8F =D0=BF=D0=BE=D0=BD=D0=B8=D0=BC=D0=B0=D1=8E, = =D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0 =D0=B2 =D1=82=D0=BE=D0=BC,= =D1=87=D1=82=D0=BE =D1=83 =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0 >> > =D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE "=D1=81=D1=82= =D0=B0=D0=B1=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D1=85" =D0=B2=D0=B5=D1=82=D0=BE= =D0=BA, =D1=81=D1=80=D0=B5=D0=B4=D0=B8 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B= =D1=85 >> > v2.9 (=D0=B8=D0=B7 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9 =D0=BF= =D0=B0=D0=BA=D0=B5=D1=82 =D1=81=D0=BE=D0=B1=D1=80=D0=B0=D0=BD =D1=81=D0=B5= =D0=B9=D1=87=D0=B0=D1=81) >> > =D0=B8 v2.11 (=D0=B8=D0=B7 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9 = =D0=BC=D1=8B =D1=85=D0=BE=D1=82=D0=B8=D0=BC =D1=81=D0=BE=D0=B1=D1=80=D0=B0= =D1=82=D1=8C =D0=BF=D0=B0=D0=BA=D0=B5=D1=82), >> > =D0=B8 =D1=8D=D1=82=D0=B8 =D0=B2=D0=B5=D1=82=D0=BA=D0=B8 =D0=B4=D1=80= =D1=83=D0=B3 =D0=BE=D1=82 =D0=B4=D1=80=D1=83=D0=B3=D0=B0 =D0=BD=D0=B5 =D0= =BD=D0=B0=D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=82. =D0=A1=D0=BE=D0=BE=D1= =82=D0=B2=D0=B5=D1=82=D1=81=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE, >> > =D0=BD=D1=83=D0=B6=D0=BD=D0=BE =D0=BF=D0=B5=D1=80=D0=B5=D0=B5=D1=85=D0= =B0=D1=82=D1=8C =D1=81 =D0=BE=D0=B4=D0=BD=D0=BE=D0=B9 =D0=B0=D0=BF=D1=81=D1= =82=D1=80=D0=B8=D0=BC=D0=BD=D0=BE=D0=B9 =D0=B2=D0=B5=D1=82=D0=BA=D0=B8 =D0= =BD=D0=B0 =D0=B4=D1=80=D1=83=D0=B3=D1=83=D1=8E. >> > >> > =D0=AF =D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE =D1=83= =D0=B3=D0=B0=D0=B4=D0=B0=D0=BB? =D0=94=D0=B0, =D0=BD=D0=B0=D0=B2=D0=B5=D1=80=D0=BD=D1=8F=D0=BA=D0=B0 =D1=8D= =D1=82=D0=BE =D1=82=D0=B0=D0=BA. =D0=9C=D0=BD=D0=B5 =D0=BA=D0=B0=D0=B6=D0= =B5=D1=82=D1=81=D1=8F, =D1=82=D0=B0=D0=BA=D0=B0=D1=8F =D1=81=D0=B8=D1=82=D1= =83=D0=B0=D1=86=D0=B8=D1=8F =D0=B2=D0=BE =D0=B2=D1=81=D0=B5=D1=85 =D1=80=D0= =B0=D0=B7=D0=B2=D0=B8=D1=82=D1=8B=D1=85=20 =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0=D1=85. =D0=A5=D0=BE=D1=82= =D1=8F =D0=BF=D0=BE=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D1=83 =D0=BA=D0=B0=D0=B6= =D0=B5=D1=82=D1=81=D1=8F, =D1=87=D1=82=D0=BE =D1=8D=D1=82=D0=BE =D0=BE=D0= =BD=D0=B8 rebase =D0=B4=D0=B5=D0=BB=D0=B0=D1=8E=D1=82 =D0=B8=D0=BD=D0=BE=D0= =B3=D0=B4=D0=B0 :) =2E.. > =D0=9A=D0=B0=D0=BA =D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82, =D1=8F =D0= =B1=D1=8B =D0=BD=D0=B0 =D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=B5 =D1=82=D0=B5=D1= =85 =D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1= =8B=D0=B5 =D0=BF=D0=BE=D0=BC=D0=BD=D1=8E, =D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0= =BB=20 > =D0=B0=D0=BD=D0=B0=D0=BB=D0=BE=D0=B3=D0=B8=D1=87=D0=BD=D0=BE=D0=B5: >=20 > git switch -C master v2.11.1 > git merge -s ours gears/sisyphus -m 'merge -s ours gears/sisyphus' > git restore -W -S -s gears/sisyphus .gear > git commit --amend -m 'merge -s ours gears/sisyphus, restore .gear' >=20 > =D0=B8 =D0=B4=D0=B0=D0=BB=D1=8C=D1=88=D0=B5 =D0=BA=D0=B0=D0=BA =D0=BE=D0= =B1=D1=8B=D1=87=D0=BD=D0=BE. =D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9, =D1=83 =D0=B2=D0=B0=D1=81 =D0= =B1=D1=83=D0=B4=D0=B5=D1=82 =D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0= =BE=D1=81=D1=82=D1=8C =D0=BF=D0=BE=D0=BF=D1=80=D0=BE=D0=B1=D0=BE=D0=B2=D0= =B0=D1=82=D1=8C =D1=82=D0=B0=D0=BA =D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1= =82=D1=8C =D0=BF=D0=B0=D0=BA=D0=B5=D1=82? P.S. =D0=92=D1=81=D0=B5=D0=BC =D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B5 =D1=81= =D0=BF=D0=B0=D1=81=D0=B8=D0=B1=D0=BE! --=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