Date: Thu, 25 Jun 2020 09:56:19 -0300 From: Renato Botelho <garga@FreeBSD.org> To: Ed Maste <emaste@freebsd.org>, freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> In-Reply-To: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com> References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 24/06/20 13:34, Ed Maste wrote: > We currently have a FreeBSD Subversion primer in the committer's guide: > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html > > I've started a translation of this into a Git primer, at: > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view > > I'm particularly interested in feedback on how much git background / > theory of operation we want to include here (vs referring to external > documentation). Thank you for writing this document! 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. -- Renato Botelho
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5b1b2132-d3ed-96b6-1e48-18c3ea515970>