Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master to main in lesson content #69

Open
wants to merge 1 commit into
base: gh-pages
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _episodes/03-versioncontrol.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ keypoints:
* Collaboration would be a *lot* easier if version control systems knew
how to manage rich document formats...
* Use a *feature branch workflow*
* Designate one branch as the main development branch (typically called `master`)
* Create a new branch for each feature from `master`
* Designate one branch as the main development branch (typically called `main`)
* Create a new branch for each feature from `main`
* Only use that branch for that feature
* Merge the branch when the feature is done

Expand All @@ -43,7 +43,7 @@ keypoints:
> 1. Clone the SNDS repo to your laptop
> 2. Create a new branch with a unique label (such as your last name) and check out that branch.
> 3. Add your name and email address to the `CONTRIBUTORS` file.
> 4. Commit your changes, push your new branch to Github, and open a new pull request to merge your "feature branch" into `master`.
> 4. Commit your changes, push your new branch to Github, and open a new pull request to merge your "feature branch" into `main`.
{: .challenge}

{% include links.md %}