From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 6 Dec 2021 14:03:32 +0300 From: "Anton V. Boyarshinov" To: Evgeny Sinelnikov Message-ID: <20211206140332.3dfa0cc5@tower> In-Reply-To: References: <20211206104252.590931a0@t14.localdomain> <20211206133121.5340bcd7@tower> 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 , ALT Linux Team development discussions 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 List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2021 11:03:33 -0000 Archived-At: List-Archive: List-Post: > > > =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. =20 > > > > =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=AD=D1=82=D0=BE =D0=BD=D0=B5 =D1=81=D1=82=D0=BE=D0=BB=D1=8C =D0=B2=D0= =B0=D0=B6=D0=BD=D0=BE. =D0=A1 =D1=82=D0=BE=D1=87=D0=BA=D0=B8 =D0=B7=D1=80=D0=B5=D0=BD=D0=B8=D1=8F = =D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8 =D1=8F=D0=B4=D1=80= =D0=B0 =D0=B2 =D0=B4=D0=B8=D1=81=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=B8= =D0=B2=D0=B5 =D1=8D=D1=82=D0=BE =D0=BE=D1=87=D0=B5=D0=BD=D1=8C =D0=B2=D0=B0= =D0=B6=D0=BD=D0=BE. =D0=AD=D1=82=D0=BE =D0=BD=D1=83=D0=B6=D0=BD=D0=BE =D0=B2 =D1=82=D0=BE=D0=BC =D1=87=D0=B8=D1=81=D0=BB=D0=B5 =D0=B4=D0=BB=D1=8F= =D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8 =D1=81=D0=BE=D0=BE= =D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9 =D0=BE=D0=B1 =D0=BE=D1=88=D0=B8=D0=B1= =D0=BA=D0=B0=D1=85 =D0=B2=D0=B8=D0=B4=D0=B0 "=D0=B2 =D1=8D=D1=82=D0=BE=D0= =BC =D1=80=D0=B5=D0=BB=D0=B8=D0=B7=D0=B5 =D1=8F=D0=B4=D1=80=D0=B0 =D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BB=D0=BE, =D0=B0 =D0=B2 =D1=8D=D1= =82=D0=BE=D0=BC =D1=81=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB=D0=BE=D1=81=D1=8C". > =D0=A4=D0=B0=D0=BA=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8 =D1=82=D0=B0= =D0=BA =D0=B2=D1=81=D0=B5=D0=B3=D0=B4=D0=B0 =D0=B2=D0=B8=D0=B4=D0=BD=D0=BE = =D0=B1=D1=83=D0=B4=D0=B5=D1=82 =D1=80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD=D1=83= =D1=8E > =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=BD=D1=83=D1=8E =D0=B2=D0=B5= =D1=82=D0=BA=D1=83 =D1=81 =D0=BD=D0=B0=D0=B1=D0=BE=D1=80=D0=BE=D0=BC =D0=BD= =D0=B0=D1=88=D0=B8=D1=85 =D0=BF=D0=B0=D1=82=D1=87=D0=B5=D0=B9, =D0=BA=D0=B0= =D0=B6=D0=B4=D1=8B=D0=B9 =D1=80=D0=B0=D0=B7 =D0=B8=D0=BC=D0=B5=D0=BD=D0=BD= =D0=BE =D1=82=D1=83, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=83=D1=8E > =D0=BC=D0=BE=D0=B6=D0=BD=D0=BE =D0=BE=D1=82=D0=B4=D0=B0=D1=82=D1=8C. =D0=90 =D0=BA=D0=BE=D0=BC=D1=83-=D1=82=D0=BE =D0=BD=D1=83=D0=B6=D0=BD=D0=BE= =D0=B8=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE =D0=BD=D0=B0=D1=88=D0=B5 std-def =D1= =8F=D0=B4=D1=80=D0=BE =D1=81=D0=BE =D0=B2=D1=81=D0=B5=D0=BC=D0=B8 =D0=BF=D0= =B0=D1=82=D1=87=D0=B0=D0=BC=D0=B8 =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=BF=D0=BE=D0=B2=D0=B5=D1=80=D1=85 =D0=BD=D0=B5=D0=B3=D0=BE? =D0=9A=D0=B0= =D0=BA=D0=B0=D1=8F-=D1=82=D0=BE =D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=BD=D0=B0= =D1=8F =D0=B8=D0=B4=D0=B5=D1=8F. =D0=9D=D0=B5 =D0=B3=D0=BE=D0=B2=D0=BE=D1= =80=D1=8F =D1=83=D0=B6 =D0=BE =D1=82=D0=BE=D0=BC, =D1=87=D1=82=D0=BE std-def =D1=8F=D0=B4=D1=80=D0=BE =D1=8D=D1=82=D0=BE =D0=B2=D1=81=D0=B5=D0=B3=D0=B4= =D0=B0 longterm =D0=B8, =D0=BF=D0=BE=D1=80=D0=BE=D0=B9, =D0=BD=D0=B5 =D1=81= =D0=B0=D0=BC=D1=8B=D0=B9 =D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B8= =D0=B9 longterm, =D1=82=D0=B0=D0=BA =D1=87=D1=82=D0=BE =D1=80=D0=B0=D1=81=D1=81=D0=BC=D0=B0=D1=82=D1=80=D0=B8=D0=B2=D0=B0=D1=82=D1= =8C =D0=B5=D0=B3=D0=BE =D0=BA=D0=B0=D0=BA =D0=B1=D0=B0=D0=B7=D1=83 =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=BA=D0=B0=D0=B6=D0=B5=D1=82=D1=81=D1=8F =D0=BC=D0=BD=D0=B5 =D0=BD=D0=B5 = =D0=B2=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5 =D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC. =D0=9F=D0=BE=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D1=83 =D0=BF=D1=80=D0=B8 = =D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B5 =D0=B8 =D0=BF= =D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B5 =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=B3=D0=BE =D1=8F= =D0=B4=D1=80=D0=B0 workflow =D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE =D1=80= =D0=B0=D0=B7=D0=BB=D0=B8=D1=87=D0=B0=D0=B5=D1=82=D1=81=D1=8F, =D1=8F =D0=BD= =D0=B5 =D0=B2=D0=B8=D0=B6=D1=83 =D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4= =D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8 =D0=BF=D0=BE=D0=B4=D0=B3=D0=BE=D0=BD= =D1=8F=D1=82=D1=8C =D0=BE=D0=B4=D0=BD=D0=BE =D0=BF=D0=BE=D0=B4 =D0=B4=D1=80=D1=83=D0=B3=D0=BE=D0=B5 (=D0=B2 =D0=BA=D0=B0=D0=BA=D1=83=D1=8E= =D0=BB=D0=B8=D0=B1=D0=BE =D1=81=D1=82=D0=BE=D1=80=D0=BE=D0=BD=D1=83). =D0= =91=D0=BB=D0=B0=D0=B3=D0=BE =D0=BD=D0=B5 CVS =D0=BA=D0=B0=D0=BA=D0=BE=D0=B9= =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC, git =D0=B4=D0=BE=D1=81=D1=82=D0=B0=D1=82=D0=BE=D1=87=D0=BD=D0=BE =D0=B3=D0=B8= =D0=B1=D0=BA=D0=B8=D0=B9 =D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BC=D0=B5= =D0=BD=D1=82. > =D0=AD=D1=82=D0=BE =D0=B8 =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=BF=D0=BE=D0=BB=D0=B5=D0=B7=D0=BD=D0= =BE =D0=B8 =D0=B4=D0=BB=D1=8F =D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8 =D0=B2= =D1=81=D0=B5=D0=B3=D0=B4=D0=B0 > =D0=BF=D0=BE=D0=BD=D1=8F=D1=82=D0=BD=D0=BE. =D0=A2=D1=83=D1=82 =D0=BD=D1= =83=D0=B6=D0=B5=D0=BD =D0=B2=D0=BD=D1=8F=D1=82=D0=BD=D1=8B=D0=B9 README =D0= =B8 =D0=BF=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=BA=D0=B0 =D0=BA =D0=B4=D0=BE=D0= =BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D0=B8 =D0=BD=D0=B0 > alltlinux.org, =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=83=D1=8E =D0=BD=D1=83=D0= =B6=D0=BD=D0=BE =D0=B1=D1=83=D0=B4=D0=B5=D1=82 =D0=BE=D0=B1=D0=BD=D0=BE=D0= =B2=D0=B8=D1=82=D1=8C. >=20 > =D0=A1 =D1=8F=D0=B4=D1=80=D0=BE=D0=BC =D0=BC=D1=8B =D0=B8=D0=BC=D0=B5=D0= =BD=D0=BD=D0=BE =D1=8D=D1=82=D1=83 =D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D1= =8E =D0=B8 =D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B0=D0=B5=D0=BC. =D0=9A=D0=B0= =D0=B6=D0=B4=D1=8B=D0=B9 =D1=80=D0=B0=D0=B7 - =D0=BD=D0=BE=D0=B2=D1=8B=D0= =B9 =D1=81=D1=80=D0=B5=D0=B7 =D1=81 > =D0=BD=D0=B0=D1=88=D0=B8=D0=BC=D0=B8 =D1=81=D1=82=D0=B0=D1=80=D1=8B=D0=BC= =D0=B8 =D0=BF=D0=B0=D1=82=D1=87=D0=B0=D0=BC=D0=B8. =D0=98=D1=81=D1=82=D0=BE= =D1=80=D0=B8=D1=8F =D0=B8=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE =D1=8D=D1=82=D0=BE = =D0=B8 =D0=B1=D1=83=D0=B4=D0=B5=D1=82 =D1=82=D0=BE=D0=B3=D0=B4=D0=B0 =D0=BE= =D1=82=D1=80=D0=B0=D0=B6=D0=B0=D1=82=D1=8C. =D0=90 =D0=B2 > =D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B8=D0=BA=D0=B0=D1=85 =D1=8F=D0=B4= =D1=80=D0=B5 =D0=BD=D0=B5 =D0=B1=D1=83=D0=B4=D0=B5=D1=82 =D0=BD=D0=B0=D1=88= =D0=B8=D1=85 =D1=81=D0=BF=D0=B5=D1=86=D0=B8=D1=84=D0=B8=D1=87=D0=BD=D1=8B= =D1=85, =D1=81=D0=B1=D0=BE=D1=80=D0=BE=D1=87=D0=BD=D1=8B=D1=85 =D1=84=D0=B0= =D0=B9=D0=BB=D0=BE=D0=B2 - =D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE > =D0=BF=D1=80=D0=BE=D0=B4=D1=83=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D0=B5. >=20 >=20 >=20