From owner-freebsd-git@freebsd.org Thu Dec 10 02:17:22 2020 Return-Path: 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 DE1124719E1 for ; Thu, 10 Dec 2020 02:17:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 4CryH56TCtz4m7v for ; Thu, 10 Dec 2020 02:17:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id z11so3487203qkj.7 for ; Wed, 09 Dec 2020 18:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jO18iU5emyOMSDz6FW6CFoSS+Lxt40RmGdIlX6MeUfM=; b=XpCgFZ2If+w+QNbpPOAUK0296nvf7o5HgHBdMlslJWjZmpw3RLtn5PK02SshHsl1+e LTsisowPsaWkllHzZqeTGL6teZToTVLf56hWNRJbkpO3hYQRAPEOZhbRFnAeFuDX97lE b6Nz7FWD6XpFgDbu/QqD8rAMUKGVYt307vuhihcakSkBpeeiS59nOzzyPKZR8z6VeEni CKYA5hPYX+khXFsIMmsXB4gKDzCtqnjXZdNZYJa6dBM1bbeX8c4qIdf1GI5keMZHV/44 ri3+TeUPSDZmCM33rQshhrB2frftbMSbni2+wEvJAHAoTBNZlHiZ/g9rJWRqvCh6Uc/Y 1dpg== 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=jO18iU5emyOMSDz6FW6CFoSS+Lxt40RmGdIlX6MeUfM=; b=dL84krmzQwIRA5Sf7ZWvDIqNPapxOR4Hoa3LyjzNfRzg+XVpfNSAeZo2+TwbZriwpq pxbJtKZtRFEUcpiEg/BgeaNTiS5jquKRCdiDG13o8KHloUBn7DFep6eugOMLZHQHDidV fQYyqwrU+DXL30Zd3Jb1UAjn1D1i6gu1MQXRXliN6C4aX8ZY5MtojWDKgd/t05jtx6sg xCcLCYUb7rMlRyoJrawdbzaUU0lG3IyE+u8ecs9K+0YQQQlYgI/Q6rh7SluenYKcn9ah CjszGbrcr2b1gqBdx4CtVPUiBZvXhydCJwtYHk4AKWInQw5PTCGl/27hEoAMbuGgWOQ/ SXpg== X-Gm-Message-State: AOAM532tuXs4iFO8Jr/V+1wK8ullcumdGTCxQraIKfC4bPIpvka74A8e wXqHs9Hp0TqpZw7pluKrhM9pD7oxXBo113nIvWG1l3oop8xFGA== X-Google-Smtp-Source: ABdhPJzPv5On8L9zSQQiaYzTmQ17ftr0U+jq0sA6GKYAXNlK/NqXdgRVB74mPy8MyOmIckehIxwWUBGDmPfd91HVyLo= X-Received: by 2002:a05:620a:2199:: with SMTP id g25mr6305141qka.89.1607566640718; Wed, 09 Dec 2020 18:17:20 -0800 (PST) MIME-Version: 1.0 References: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Wed, 9 Dec 2020 19:17:09 -0700 Message-ID: Subject: Re: question regarding git branches To: "Conrad E. Meyer" Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4CryH56TCtz4m7v X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=XpCgFZ2I; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72a:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72a:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 02:17:22 -0000 On Wed, Dec 9, 2020 at 5:38 PM Conrad Meyer wrote: > Hi Jason, > > I believe the plan at this time is to use a single branch, rebase&push > workflow initially. This is basically the same model as our > Subversion workflow, so it is more of a 1:1 transition. Afterwards, > we might transition to a PR+merge model. I think the long-term > workflow is still undecided. > > This is just my best understanding and someone on the Git team > probably knows better. > This is right. Long term, we'll almost certainly retain a linear history, but offer ways to send pull requests that are rebased and committed. Phase 1 is all about a great leap sideways from svn to git. Phase 2 and beyond can then be done more iteratively (with perhaps lots of experimentation). Warner > Best regards, > Conrad > > On Wed, Dec 9, 2020 at 4:17 PM wrote: > > > > Hi, > > > > I am a little late to the dance with git in respect to FreeBSD (haven't > > been following as much as I would like to given availability), but have > > been using it for awhile now at work and personally. With the recent > > migration from svn to git for documentation I saw that there was only > > one branch named "main." I think this is great that we also went with > > this name. > > > > My question more so is around workflow. Typically, it is seen as good > > practice to commit to a new branch and then merge to the main branch. Is > > this something that is being done as part of the commit process, or are > > commits being done straight to main branch? > > > > I'm not sure I need to go into the reasoning of having multiple branches > > and what that can do insofar as community and mentoring support, > > development CI/CD pipelines, etc. If this conversation goes down this > > path, though, I would be more than happy to discuss along with others. > > > > Thanks in advance! > > -jgh > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >