diff options
| author | wiggitywhitney <47868428+wiggitywhitney@users.noreply.github.com> | 2021-11-12 09:18:28 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 07:18:28 -0800 |
| commit | 1ef48631b89141e8b614002b4bdce6560df31958 (patch) | |
| tree | bf90e61148ba3f790e098f9ff3adf0b9b5fb8d5d | |
| parent | 24f87a099f5cd0c89e6fdf1ec18bbc0ba81263cd (diff) | |
Change 'master' to 'main' in github-workflow markdown (#6221)
* Change master to main
* Revert changes and add note to clarify that default branch may be called main
* Move comments to top of respective codeblocks
| -rw-r--r-- | contributors/guide/github-workflow.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/contributors/guide/github-workflow.md b/contributors/guide/github-workflow.md index 73fbe74c..3c9f76fe 100644 --- a/contributors/guide/github-workflow.md +++ b/contributors/guide/github-workflow.md @@ -67,6 +67,9 @@ git remote -v Get your local master up to date: ```sh +# Depending on which repository you are working from, +# the default branch may be called 'main' instead of 'master'. + cd $working_dir/kubernetes git fetch upstream git checkout master @@ -87,6 +90,9 @@ This workflow is process-specific; for quick start build instructions for [kuber ### 4 Keep your branch in sync ```sh +# Depending on which repository you are working from, +# the default branch may be called 'main' instead of 'master'. + # While on your myfeature branch git fetch upstream git rebase upstream/master @@ -246,6 +252,9 @@ will create the PR branch inside the main repository rather than inside your for - Create a branch and sync it with upstream. ```sh + # Depending on which repository you are working from, + # the default branch may be called 'main' instead of 'master'. + # create a branch git checkout -b myrevert |