Date: Thu, 25 Jun 2020 15:50:21 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Konstantin Belousov <kostikbel@gmail.com> Cc: Ed Maste <emaste@freebsd.org>, freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <3DDCE53A-3B0D-4B0A-8F8B-9C42F4935457@FreeBSD.org> In-Reply-To: <20200625132606.GB32126@kib.kiev.ua> References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com> <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO%2BX6SuM93Q@mail.gmail.com> <20200625132606.GB32126@kib.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_0B5B637B-C806-490D-95B5-1357251EE16E Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 25 Jun 2020, at 15:26, Konstantin Belousov <kostikbel@gmail.com> wrote: > > On Thu, Jun 25, 2020 at 09:05:51AM -0400, Ed Maste wrote: >> On Thu, 25 Jun 2020 at 08:56, Renato Botelho <garga@freebsd.org> wrote: >>> >>> Based on what I saw in other projects when people moved to git, a common >>> mistake that happens is people abusing `git pull` and creating merges >>> where it's not desired, like in main branch when bringing remote changes >>> to local modified repository. Maybe it's worth to add a paragraph >>> saying some words about always use rebase instead of merge. >> >> Indeed - I started touching on that at the beginning, but we need to >> make that clear in the day-to-day use example. Probably a broad "never >> use git pull" warning too. > > Isn't it a common (and necessary) practice to disable push of merge > commits and non-ff pushes for master branch of centralized repository, > by commit hooks ? Does the prototype repo enforce such policy ? That is indeed a requirement, as is the disabling of force-pushing. GitHub and GitLab have simple controls in their UIs for this, to protect one or more branches against such actions. -Dimitry --Apple-Mail=_0B5B637B-C806-490D-95B5-1357251EE16E Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCXvSrnQAKCRCwXqMKLiCW oyEkAKCvF1Ch2LPVK3GlN0z+2S67oAyl4ACgvzUocupPjVXJFtrE5AXoHXmduXY= =u3Nt -----END PGP SIGNATURE----- --Apple-Mail=_0B5B637B-C806-490D-95B5-1357251EE16E--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3DDCE53A-3B0D-4B0A-8F8B-9C42F4935457>