From owner-freebsd-git@freebsd.org  Thu Jun 25 13:06:05 2020
Return-Path: <owner-freebsd-git@freebsd.org>
Delivered-To: freebsd-git@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id AE1EC35A8F1
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Thu, 25 Jun 2020 13:06:05 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: from mail-il1-f179.google.com (mail-il1-f179.google.com
 [209.85.166.179])
 (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (2048 bits) client-digest SHA256)
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49t0d92mtvz43h1;
 Thu, 25 Jun 2020 13:06:05 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: by mail-il1-f179.google.com with SMTP id b13so5205231ilq.11;
 Thu, 25 Jun 2020 06:06:05 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:references:in-reply-to:from:date
 :message-id:subject:to:cc;
 bh=/qHM6tZFvj6UxjC2Eb8ZBkMJL6wv/NONAlKXOjQ9qzQ=;
 b=OWiwB7JF+JzGr7neB0m88FZpY0lsIrORg8HQONjUk4WWszBfkXatd7X/8kuBnRhmVd
 FZmItwn+MnJBIpmAZLaRCgbMzeL+U/ijpBSNLIgcG5We6G5bmtfACyme6u+G/jH3SpBN
 JRH6NjL6BKJJIuRqWokuD+2XCxjbeYvpW5l1ai96fT97WCVUGeoVwh+V9/stw26rZeJt
 M5t/eXlKs3UYHP69kdNbaHFWpkFrmcQClk0UNxCVMt98RwOBsrdziPpbOUnDIJfxHvJz
 8ZVtEdQDvTBuBVqSpaV1cVitxjMvwGbqC5FWW+wq9CgmCyXV7M9x/TdsmmRVuZFy3YOq
 68OQ==
X-Gm-Message-State: AOAM530+IY3SUUC7k1He3LoOPcatFHiFmeIUtjrxYXbmnDwFwJR2U/jG
 uVGFQOt15Jphg+kPxHQMVpNP5HnanhS/w+xbLjwRcQ==
X-Google-Smtp-Source: ABdhPJwt/aV+iO3Skq1ay/gx3M4onHodE7/l3gxu3DWPRTazb5KhsRPUYNVIkt/yf+PnTPf+1bgQgS0vnOHdE7yp4kQ=
X-Received: by 2002:a92:5e07:: with SMTP id s7mr22611633ilb.182.1593090363559; 
 Thu, 25 Jun 2020 06:06:03 -0700 (PDT)
MIME-Version: 1.0
References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com>
 <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org>
In-Reply-To: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org>
From: Ed Maste <emaste@freebsd.org>
Date: Thu, 25 Jun 2020 09:05:51 -0400
Message-ID: <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO+X6SuM93Q@mail.gmail.com>
Subject: Re: svn primer translation to git
To: Renato Botelho <garga@freebsd.org>
Cc: freebsd-git@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-Rspamd-Queue-Id: 49t0d92mtvz43h1
X-Spamd-Bar: ----
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[];
 ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2020 13:06:05 -0000

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.