From 24279b93ca9523896cbb36669e18b1795da1f1b3 Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Thu, 16 Jun 2022 15:57:16 +1000 Subject: [PATCH] doc/dev: s/master/main/ in title This changes "master" to "main" in a title. If we lived in an ideal world, this would have been a part of PR#46678. Signed-off-by: Zac Dover (cherry picked from commit f5fd158bea2a54b83c7f75cd806885de44045ad6) --- doc/dev/developer_guide/basic-workflow.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/dev/developer_guide/basic-workflow.rst b/doc/dev/developer_guide/basic-workflow.rst index c10025b51d13d..db048190e1ff1 100644 --- a/doc/dev/developer_guide/basic-workflow.rst +++ b/doc/dev/developer_guide/basic-workflow.rst @@ -163,8 +163,8 @@ Fixing the Bug .. _synchronizing: -Synchronizing Local Master with Upstream Master -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Synchronizing Local Main with Upstream Main +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In your local git environment, there is a copy of the ``main`` branch in ``remotes/origin/main``. This is called "local main". This copy of the -- 2.39.5