@@ -267,7 +267,7 @@ Your CI script might work like this:
267267
268268* Create a tarball from the ``.mypy_cache `` directory.
269269
270- * Determine the current git master branch commit id (say, using
270+ * Determine the current git main branch commit id (say, using
271271 ``git rev-parse HEAD ``).
272272
273273* Upload the tarball to the shared repository with a name derived from the
@@ -282,13 +282,13 @@ populates the local ``.mypy_cache`` directory from the shared
282282repository and then runs a normal incremental build.
283283
284284The wrapper script needs some logic to determine the most recent
285- central repository commit (by convention, the ``origin/master `` branch
285+ central repository commit (by convention, the ``origin/main `` branch
286286for git) the local development branch is based on. In a typical git
287287setup you can do it like this:
288288
289289.. code ::
290290
291- git merge-base HEAD origin/master
291+ git merge-base HEAD origin/main
292292
293293 The next step is to download the cache data (contents of the
294294``.mypy_cache `` directory) from the shared repository based on the
@@ -335,11 +335,11 @@ at least if your codebase is hundreds of thousands of lines or more:
335335 potentially large number of changes in an incremental build, as this can
336336 be much slower than downloading cache data and restarting the daemon.
337337
338- * If the current local branch is based on a very recent master commit,
338+ * If the current local branch is based on a very recent main commit,
339339 the remote cache data may not yet be available for that commit, as
340340 there will necessarily be some latency to build the cache files. It
341341 may be a good idea to look for cache data for, say, the 5 latest
342- master commits and use the most recent data that is available.
342+ main commits and use the most recent data that is available.
343343
344344* If the remote cache is not accessible for some reason (say, from a public
345345 network), the script can still fall back to a normal incremental build.
0 commit comments