@@ -247,7 +247,7 @@ Your CI script might work like this:
247247
248248* Create a tarball from the ``.mypy_cache `` directory.
249249
250- * Determine the current git master branch commit id (say, using
250+ * Determine the current git main branch commit id (say, using
251251 ``git rev-parse HEAD ``).
252252
253253* Upload the tarball to the shared repository with a name derived from the
@@ -262,13 +262,13 @@ populates the local ``.mypy_cache`` directory from the shared
262262repository and then runs a normal incremental build.
263263
264264The wrapper script needs some logic to determine the most recent
265- central repository commit (by convention, the ``origin/master `` branch
265+ central repository commit (by convention, the ``origin/main `` branch
266266for git) the local development branch is based on. In a typical git
267267setup you can do it like this:
268268
269269.. code ::
270270
271- git merge-base HEAD origin/master
271+ git merge-base HEAD origin/main
272272
273273 The next step is to download the cache data (contents of the
274274``.mypy_cache `` directory) from the shared repository based on the
@@ -315,11 +315,11 @@ at least if your codebase is hundreds of thousands of lines or more:
315315 potentially large number of changes in an incremental build, as this can
316316 be much slower than downloading cache data and restarting the daemon.
317317
318- * If the current local branch is based on a very recent master commit,
318+ * If the current local branch is based on a very recent main commit,
319319 the remote cache data may not yet be available for that commit, as
320320 there will necessarily be some latency to build the cache files. It
321321 may be a good idea to look for cache data for, say, the 5 latest
322- master commits and use the most recent data that is available.
322+ main commits and use the most recent data that is available.
323323
324324* If the remote cache is not accessible for some reason (say, from a public
325325 network), the script can still fall back to a normal incremental build.
0 commit comments