Date: Thu, 25 Jun 2020 09:05:51 -0400 From: Ed Maste <emaste@freebsd.org> To: Renato Botelho <garga@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO%2BX6SuM93Q@mail.gmail.com> In-Reply-To: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com> <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO%2BX6SuM93Q>