X-Recipient: archive-cygwin AT delorie DOT com
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ADE5F38543B2
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cygwin.com;
	s=default; t=1673610972;
	bh=6nsbEBV16tKkqcw2GxI8DXKGBQKQv4dOCG2dcU5g0+I=;
	h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:
	 List-Help:List-Subscribe:From:Reply-To:Cc:From;
	b=mOpYpNKFszRyTaaJX8t7EeQmi6y6w0Rf/0lXHJjGwe7eUpGPAVFfbIdK0PXewpc8Q
	 kYKIy2nz77/3G4dinC8V6vOySyWWEPQkLwY509V4hm0rlSuiq54IEsHLmGbjrqMetQ
	 w+Cvccb5k05qkNvZjm5IzK7uiCjschwpgShjnDDE=
X-Original-To: cygwin AT cygwin DOT com
Delivered-To: cygwin AT cygwin DOT com
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8784E3858C39
X-MC-Unique: X8DtiN_2MI-de-ej46SEaw-1
Date: Fri, 13 Jan 2023 12:55:52 +0100
To: newlib AT sourceware DOT org, cygwin AT cygwin DOT com
Subject: newlib-cygwin.git repository: Switching "master" to "main"
Message-ID: <Y8FGyAT7jwl/zy5t@calimero.vinschen.de>
Mail-Followup-To: newlib AT sourceware DOT org, cygwin AT cygwin DOT com
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Disposition: inline
X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH,
 DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE,
 RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE,
 TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
 server2.sourceware.org
X-BeenThere: cygwin AT cygwin DOT com
X-Mailman-Version: 2.1.29
List-Id: General Cygwin discussions and problem reports <cygwin.cygwin.com>
List-Archive: <https://cygwin.com/pipermail/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-request AT cygwin DOT com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin>,
 <mailto:cygwin-request AT cygwin DOT com?subject=subscribe>
From: Corinna Vinschen via Cygwin <cygwin AT cygwin DOT com>
Reply-To: newlib AT sourceware DOT org, cygwin AT cygwin DOT com
Cc: Corinna Vinschen <vinschen AT redhat DOT com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "Cygwin" <cygwin-bounces+archive-cygwin=delorie DOT com AT cygwin DOT com>

Hey folks,

In the light of recent discussions, and following other projects already
having done this step, we changed the name of the "master" branch in
the newlib-cygwin.git upstream repository to "main".

If you fetched from upstream in the last two days, you might already
have noticed that an "origin/main" branch suddenly showed up, but your
"master" branch still worked as before.

The reason is that we also added a symbolic reference upstream, so that
"origin/master" points to "origin/main".  Both "branches" are now
constantly kept in sync upstream.

Therefore, you can continue your work on "master" without disruption,
if you prefer to do so.

However, on the client side, the "master" and "main" branches are
treated as two distinct branches.  If you work on your local "main"
clone and commit a patch, it's not keeping your local "master" branch in
sync.  After pushing your change upstream, though, the upstream idea of
"main" and "master" is, again, the same.  After fetching from upstream,
the patch will show up in both tracking branches, "origin/main" as well
as "origin/master", so pulling on both local branches will show the same
tree.

Having said that.  Ideally you only use one of the branches locally
to avoid any confusion:

- If you prefer to work in "master", just continue to do so and don't
  create a local "main" branch tracking "origin/main".

- If you prefer to work in "main", checkout "origin/main" as "main" and
  delete your local "master" branch.


Have fun,
Corinna


-- 
Problem reports:      https://cygwin.com/problems.html
FAQ:                  https://cygwin.com/faq/
Documentation:        https://cygwin.com/docs.html
Unsubscribe info:     https://cygwin.com/ml/#unsubscribe-simple