From owner-freebsd-git@freebsd.org Thu Dec 10 00:38:12 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 D21094B6C45 for ; Thu, 10 Dec 2020 00:38:12 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) (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 4Crw4h1Byqz4f13; Thu, 10 Dec 2020 00:38:12 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-ot1-f49.google.com with SMTP id b18so3310383ots.0; Wed, 09 Dec 2020 16:38:12 -0800 (PST) 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:reply-to :from:date:message-id:subject:to:cc; bh=QptWGQXusko3XeGHeYvlVUmeXf/wvhN1u9qWp2syl8Y=; b=KOflnaF1RBdV/xhcrxP39r3HKhzqTZVMAWaLKRvmpCydRFYnULdz2JTqk6cmWVbNOd OEEgQtqArY55J+AtmpDg7olezfrXgLrwbcknpggQdtw2uTWVDkuKMKaTfMxHvA5YX6Fl Lzl8qPPSHpZPsiHWQehIkn5S4A8jOwp7MZpISTBgct+yPfxjDQstu0OKqIqKfAy2pRCY g43BsdRkrcHfHpMWWicRjQlWfMS7o7568i96ZOukEwJ7/xDhW58A2vfZyPUpifK/du8E DF+bAKT7+veXhI/kM5mondP6vkDh3iM2ASlshAEbVJpXGrScygYVrOiKu3/ROYJLQJxV tEQw== X-Gm-Message-State: AOAM532IBsqUk9cfFSic4zagJW5B+n2tEc1PFYu78RJKkjNxqMwR97tK UgcUVQbDJ11WjENIrLHl9+ErS9NE/mE= X-Google-Smtp-Source: ABdhPJzx4564Dh2hHDijfBh/64gvhmC6PqA6JcRH3cmRmUwKpv7c/zVfK6DHFmCCGq7jpRTTvLYApw== X-Received: by 2002:a05:6830:3154:: with SMTP id c20mr4250387ots.286.1607560690922; Wed, 09 Dec 2020 16:38:10 -0800 (PST) Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com. [209.85.167.175]) by smtp.gmail.com with ESMTPSA id l21sm793967otd.0.2020.12.09.16.38.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Dec 2020 16:38:10 -0800 (PST) Received: by mail-oi1-f175.google.com with SMTP id 15so3832210oix.8; Wed, 09 Dec 2020 16:38:10 -0800 (PST) X-Received: by 2002:aca:383:: with SMTP id 125mr3690339oid.122.1607560690449; Wed, 09 Dec 2020 16:38:10 -0800 (PST) MIME-Version: 1.0 References: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> In-Reply-To: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Wed, 9 Dec 2020 16:37:59 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: question regarding git branches To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Crw4h1Byqz4f13 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of csecem@gmail.com designates 209.85.210.49 as permitted sender) smtp.mailfrom=csecem@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; HAS_REPLYTO(0.00)[cem@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.49:from]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-1.00)[-0.999]; RCPT_COUNT_TWO(0.00)[2]; FORGED_SENDER(0.30)[cem@freebsd.org,csecem@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.210.49:from]; R_DKIM_NA(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_NEQ_ENVFROM(0.00)[cem@freebsd.org,csecem@gmail.com]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.210.49:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.49:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] 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 00:38:12 -0000 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. 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