From owner-freebsd-git@freebsd.org Thu Dec 10 00:17: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 34BA34B5E41 for ; Thu, 10 Dec 2020 00:17:12 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from thebighonker.lerctr.org (ns-b.lerctr.org [IPv6:2001:470:1f0f:3ad::53:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "*.lerctr.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CrvcR6gnjz4clh for ; Thu, 10 Dec 2020 00:17:11 +0000 (UTC) (envelope-from jgh@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=ler2019; h=Content-Type:Message-ID:Reply-To:Subject:To:From:Date: MIME-Version:Sender:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eEPNhWAfY9l4aKaTP2kl3wXWjRw59S3GEtBENI8a8vE=; b=OGF12+sZ+JnJGMTADwSUo2/kzH 4ZHdXociGBXL8Zdh0CUmI9tFK8SXSu5M6tfVl/fYGAxQzvYTYYkGDGdLdJGzp0r7TwWImv4NnRNBA gI5S4Hr8Tl/gVD0KG5O/RRKm/jc4ms4Dlg7M9wqkFc0Ojd4sQ2h6qLc/ejLlGdbO5HUMRqjPZOZkR Q2dTvEz1uIdVmSN9R2vk8SrnVon6qPC9K3Dmsf2maWhXYoihEDBMDVYHMhjU1Xh5SpqygW08dpmo3 XlojXN5voWyaMUZrpPWDIed6DRM16UXvZ1xm7/ozBJWaTLE+6prgtlw+7Ek00sLLSGwI+creSCADv cE4bdeYg==; Received-SPF: softfail (thebighonker.lerctr.org: transitioning domain of FreeBSD.org does not designate 2001:470:1f0f:3ad:bb:dcff:fe50:d900 as permitted sender) client-ip=2001:470:1f0f:3ad:bb:dcff:fe50:d900; envelope-from=jgh@FreeBSD.org; helo=webmail.lerctr.org; Received: from thebighonker.lerctr.org ([2001:470:1f0f:3ad:bb:dcff:fe50:d900]:42068 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kn9du-000PBQ-Hh for freebsd-git@freebsd.org; Wed, 09 Dec 2020 18:17:10 -0600 Received: from 2600:6c52:7d7f:987b:7c9e:585b:9be:eb12 by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Wed, 09 Dec 2020 18:17:08 -0600 MIME-Version: 1.0 Date: Wed, 09 Dec 2020 16:17:08 -0800 From: jgh@FreeBSD.org To: freebsd-git@freebsd.org Subject: question regarding git branches Reply-To: jgh@FreeBSD.org User-Agent: Roundcube Webmail/1.4.8 Message-ID: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> X-Sender: jgh@FreeBSD.org Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_de7758b0ab1c52300fd4400308159e4d"; micalg=pgp-sha256 X-Rspamd-Queue-Id: 4CrvcR6gnjz4clh X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] 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:17:12 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_de7758b0ab1c52300fd4400308159e4d Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed 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 --=_de7758b0ab1c52300fd4400308159e4d Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=488 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEjg3EV5oPyRwj8wRUIFmaY0FQ09wFAl/RaQYACgkQIFmaY0FQ 09wKFAgAllTCbrJA07o7bvEZFpsUUUryheFWANQN6ghaficQ+RsSK9aIGidKzg7b bABtBgdf1MThzkAVQwMjrTeCPoT/pZY8VjFaESO8vPYnUa1DokwQaFTxSOqCNHj+ cihOGkLpwR3Yf76HhfRGgj3mK5khO+eAAxTQOROHsemGKOczjgTrLpcvCHYOQMY2 ZgAugqHRsa4TcmH1y2AuuDRDS84it9I7zbbcV1Wpjx9ITiFBOtpMPpSseXW7y+YZ nS0B7vbD0dJ26nJsqzAeu4CYX38RcYd5XEb8V56rkpvDGdByP5QS6cwq0Eb3aiSr 6sCuKzUqiF7D8dnFpL5fkODX9VGVew== =Qq23 -----END PGP SIGNATURE----- --=_de7758b0ab1c52300fd4400308159e4d--