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.

Sign up for GitHub

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

[draft] Announce renaming master to main #151

Merged
merged 5 commits into from
Jun 22, 2020
Merged

[draft] Announce renaming master to main #151

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd9fb21
[draft] Announce renaming `master` to `main`
JonRowe Jun 17, 2020
2acac50
Apply suggestions from code review
JonRowe Jun 18, 2020
47c5a5f
Remove . from titles
JonRowe Jun 22, 2020
be6e7ce
Allow optionally supressing comments
JonRowe Jun 22, 2020
fe1c50f
Update publication date
JonRowe Jun 22, 2020
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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Two spelling / grammar fixes.

Co-authored-by: Xavier Shay <[email protected]>
Co-authored-by: Benoit Tigeot <[email protected]>
  • Loading branch information
@JonRowe @xaviershay @benoittgt
3 people authored Jun 18, 2020
commit 2acac50b270b00af56f90d14c9fe581caba00432
4 changes: 2 additions & 2 deletions source/blog/2020-06-16-rspec-branching-strategy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ author: Jon Rowe

RSpec repositories will deprecate the use of `master` for the default branch
name. We will wait for a consensus on the new name for the default branch,
in particular what new default is choosen by Github.
in particular what new default is chosen by Github.

If no other consensus is arrived at by 1st of August, `master` will be
renamed `main`. At that point all development effort will be based off
Expand All @@ -25,7 +25,7 @@ to follow suit and rename this branch.
We currently favour `main` as the new name (it has shared muscle memory with
the old) but we also recognise that having community consensus around a
default name is important as it reduces the amount of surprise encountered by
developers. So we wil wait for the community to settle on a new default name,
developers. So we will wait for the community to settle on a new default name,
in particular for Github to change their default, but if none has been
announced by 1st August we will use `main`.

Expand Down