File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ Porting the .NET Runtime to a new architecture typically follows along the
1515following path.
1616
1717As engineering continues along the development path, it is best if the logic can
18- be placed into the master repository of the runtime as soon as possible. This
18+ be placed into the main branch of the runtime as soon as possible. This
1919will have 2 major effects.
2020
21211 . Individual commits are easier to review.
Original file line number Diff line number Diff line change @@ -3,18 +3,18 @@ Branching Guide
33
44We will have the following branches in the corefx repository:
55
6- * ** master **
6+ * ** main **
77 * Where most development happens
88 * Submit your PRs here unless you are adding API to a type that exists in the full .NET Framework
99
1010* ** release/[ name] **
11- * Release branches snapped from master .
11+ * Release branches snapped from main .
1212 * Do not submit pull requests to these branches
1313 * Fixes here do not flow to follow-up releases
14- * Generally, fixes after a snap needing to make it in to a release will go in to master and get cherry-picked to the release branch.
14+ * Generally, fixes after a snap needing to make it in to a release will go in to main and get cherry-picked to the release branch.
1515
1616* ** dev/[ name] **
1717 * Features (aka topics) under active development by more than one developer.
1818 * Submit PRs here only if you've made prior arrangements to work on something in one of these branches.
1919 * It is up to the developers creating these branches to decide what level of review is required
20- * These features will only ship if they are successfully pulled to master or future via the standard PR and API review process.
20+ * These features will only ship if they are successfully pulled to main or future via the standard PR and API review process.
Original file line number Diff line number Diff line change @@ -73,7 +73,7 @@ python f:\gh\runtime\src\coreclr\scripts\superpmi.py replay -filter tests
7373To generate ASM diffs, use the ` asmdiffs ` command. This requires a "diff" and "baseline"
7474JIT. By default, the "diff" JIT is determined automatically as for the "replay" command,
7575described above. Also by default, the baseline JIT is determined based on comparing the
76- state of your branch with the ` master ` branch, and downloading an appropriate baseline JIT from the JIT
76+ state of your branch with the ` main ` branch, and downloading an appropriate baseline JIT from the JIT
7777rolling build system. Alternatively, you can specify the path to a baseline JIT
7878compiler using the ` -base_jit_path ` argument.
7979
You can’t perform that action at this time.
0 commit comments