Skip to content

[Blog] Moving to Trunk #470

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

Merged
merged 3 commits into from
Jul 1, 2020
Merged

[Blog] Moving to Trunk #470

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e473d3c
[Blog] Moving to Trunk
AutomatedTester Jul 1, 2020
9152947
updated from comments
AutomatedTester Jul 1, 2020
cee3a40
Update site_source_files/content/blog/2020/moving-to-trunk-developmen…
diemol Jul 1, 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
21 changes: 21 additions & 0 deletions site_source_files/content/blog/2020/moving-to-trunk-development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
+++
Description = "Why we are getting rid of `master` branch in favour of `trunk`"
Title = "Moving to Trunk"
Date = 2020-07-01
Author = "AutomatedTester"
AuthorLink = "https://twitter.com/AutomatedTester"
tags = ["selenium"]
categories = ["general"]
+++

Since the project started we have been following [trunk based development](https://trunkbaseddevelopment.com/). This was a very natural fit when we were using SVN over a decade ago on Google Code.

As Google Code shut down we moved to GitHub and the git model of doing things. We moved there mostly due to the gravity that GitHub had created in Open Source projects.

This meant that we followed the standard use of `master` as our trunk to work off. Now that GitHub, and services that use GitHub, have improved support for non-master branches as default we are moving our default branch to `trunk`. It describes how we, as a project, work and is a more inclusive term.

If you have pull requests based on `master` we will see about moving that over to the `trunk` branch ourselves. If we can't, we may ask you to help with the rebasing.

We, as a project, want to make our community inclusive and this is just one step in making sure we are. Other steps we taking are improving our Code of Conduct and Community Guidelines.

Join us on Slack or IRC if you wish to discuss this further.