From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 8784E3858C39 for ; Fri, 13 Jan 2023 11:55:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8784E3858C39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673610955; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type; bh=X0gt1+A3u4fIKQnQGsbgFKiJUebMBFj+sXYejChflhU=; b=Vkneao5jz5CN0ZMTk3kXd1sBXjjU+ILcAN/cTRTnzRU5MgcD4dO+yJAmBnVjhtFv4xVX1F VLXfSVizQek1ULsJP7zApedDFmRiRkPq7S3LS6ZGKatzIRDEPxPcADbDZTkYfOZiF9roum rVB6x9/CQeR9isNxOkGFSD48SiiszYY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-484-X8DtiN_2MI-de-ej46SEaw-1; Fri, 13 Jan 2023 06:55:54 -0500 X-MC-Unique: X8DtiN_2MI-de-ej46SEaw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AFC51101A52E; Fri, 13 Jan 2023 11:55:53 +0000 (UTC) Received: from calimero.vinschen.de (unknown [10.39.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89D4953A0; Fri, 13 Jan 2023 11:55:53 +0000 (UTC) Received: by calimero.vinschen.de (Postfix, from userid 500) id 3F9D9A807C3; Fri, 13 Jan 2023 12:55:52 +0100 (CET) Date: Fri, 13 Jan 2023 12:55:52 +0100 From: Corinna Vinschen To: newlib@sourceware.org, cygwin@cygwin.com Subject: newlib-cygwin.git repository: Switching "master" to "main" Message-ID: Reply-To: newlib@sourceware.org, cygwin@cygwin.com Mail-Followup-To: newlib@sourceware.org, cygwin@cygwin.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-Type: text/plain; charset=utf-8 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 List-Id: 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