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

Change to using trunk for this repo #155

Merged
merged 1 commit into from
Jul 15, 2020
Merged

Change to using trunk for this repo #155

merged 1 commit into from
Jul 15, 2020

Conversation

jeffpaul
Copy link
Member

Description of the Change

This PR updates previous master branch references to trunk.

Alternate Designs

n/a

Benefits

Aligns to 10up's "inclusivity in code".

Possible Drawbacks

Any prior references to master will need to be updated to trunk.

Verification Process

Manually verified via GitHub Desktop UI.

Checklist:

  • I have read the CONTRIBUTING document.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my change.
  • All new and existing tests passed.

Applicable Issues

Relates to #154 and 10up/Open-Source-Best-Practices#62.

Changelog Entry

### Changed
- Renamed `master` branch to `trunk`, please update any references you have accordingly.

@jeffpaul jeffpaul added this to the 0.4.3 milestone Jul 15, 2020
@jeffpaul jeffpaul requested a review from ericmann July 15, 2020 13:40
@jeffpaul jeffpaul self-assigned this Jul 15, 2020
@jeffpaul
Copy link
Member Author

@ericmann this PR should cover all references of master in the code base, up to you on how long to let master stick around before you fully remove it. Also, we tend to set our default branch to develop and merge develop to trunk and tag on trunk for releases. Up to you if you want to do that or stick with default branch and release branch both as trunk.

@ericmann ericmann merged commit e0ea22f into trunk Jul 15, 2020
@ericmann ericmann deleted the update/branch-name branch July 15, 2020 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants