From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mJjRIB1MUGGCDwAAgWs5BA (envelope-from ) for ; Sun, 26 Sep 2021 12:31:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id EFBgHB1MUGERUwAAbx9fmQ (envelope-from ) for ; Sun, 26 Sep 2021 10:31:57 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 336752F7B8 for ; Sun, 26 Sep 2021 12:31:57 +0200 (CEST) Received: from localhost ([::1]:36328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mURRs-0004iY-5o for larch@yhetil.org; Sun, 26 Sep 2021 06:31:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mURRI-0004hL-PD for emacs-orgmode@gnu.org; Sun, 26 Sep 2021 06:31:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41308) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mURRI-0006OT-Gl; Sun, 26 Sep 2021 06:31:20 -0400 Received: from [78.194.183.21] (port=44074 helo=hal) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mURRI-0001ya-Ad; Sun, 26 Sep 2021 06:31:20 -0400 Received: by hal (Postfix, from userid 1000) id A19F71E041B; Sun, 26 Sep 2021 12:31:18 +0200 (CEST) From: Bastien To: Timothy Subject: Re: Org branches: master, main, and maint? In-Reply-To: <87k0j3eir3.fsf@gmail.com> (Timothy's message of "Sun, 26 Sep 2021 18:21:42 +0800") Organization: GNU References: <87k0j3eir3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Date: Sun, 26 Sep 2021 12:31:18 +0200 Message-ID: <87ee9bbpc9.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Org Mode List Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632652317; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3Fjm99Vw7HiJK6P7Qd40+UDvo8shAWc5Ai+Fhx/5DX4=; b=dCr3ZnErsZ8lNzc9VhF9ATdtcIS6rKDAl3hrKkbyVOfuAgqWk5WvQI2esh/oRbNjd/Rz9H 3CZtzxI7UXdFVP+npv2BUP+fOXWQ2HPtn9XSEKcdRzkzP/xCZAj3ZNbbSW0KFj5MKr1kMk NT5b9nu4wLpbnO1A9zkbJPA6qp8V2c+s1hENwgh/A/k8LbnvCue4ZAK2Cq2mISZh8SHVOm EDLqMLkTmwA1H1db1pZtUi+S2zH4qqhzCvSNSqHuHB5cX8D9OWU9/QDewsu0oc/UVRgkUO oMwo4vR9WkDZCD6rbWjp7oczSXVXtbWWGy9xUA2VZJvXo2libVnUDUUHatmdjg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632652317; a=rsa-sha256; cv=none; b=dsFRI3ha9yZTlje9usxb3LoCbwpDhvJeET/ze1Tner98uhkKMUzUugKcUeGaA3A3gzuAPT y0Z/DnmIg0Qx++z6jkdS2dr759xL9l+QlWVw4cEZiSD8k+AvBJJAkJX5d2wczJ3228W1eU AUNppYYAx/g3q89n2T/XHk5AqBpUXpjkS8iUKULRGkaMpVPExIYlxdsWA/ew1+7H7nF9Vr 5Va7pyGVkYGjB3b6hv1UKaSqW5lxK5Cw38zakCu3LB7vVki10i2yevI0O01rt4f/9TXN2K huXrS2EYS8Ttqa3OTqiNqboWfQeKrqdr3uqDD4hSt15igfsvkgpwtFwafPuTng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -0.99 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 336752F7B8 X-Spam-Score: -0.99 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3FhIp4uw+f2t Hi Timothy, Timothy writes: > I=E2=80=99ve just had a look at the branches, and I see that we currently > have > > master > main > maint Nope, the official source repository contains=20 - main : the development branch (aka the old "master") - bugfix : the bugfix branch (aka the old "maint") - km/from-master-emacs : the branch to help with Emacs sync > My previous impression was that master was the main development > branch, and maint was for testing (though I wasn=E2=80=99t 100% sure). > However now there=E2=80=99s master, main, and maint I=E2=80=99m feeling a= bit unsure > of what exactly is going on. > > A clarification would be much appreciated =F0=9F=99=82. You probably listed your local branch with "git branch -a" or by checking your .git/config file.=20=20 If you clone a fresh repo like this: ~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git and fetch all the branches (git fetch --all) you should only see the three branches mentioned above. Also, you can now forget code.orgmode.org, I've prevented any push there. HTH, --=20 Bastien