Skip to content

Commit

Permalink
Add documentation to readme outlining branches
Browse files Browse the repository at this point in the history
  • Loading branch information
jspellman814 authored and Pantheon Automation committed Apr 27, 2022
1 parent 5d066c9 commit 7e64349
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,10 @@ If you would like to keep a separate set of configuration for local development,

![alt](http://i.imgur.com/fzIeQBP.png, '')

## Branches

The `default` branch of this repository is where PRs are merged, and has [CI](https://github.com/pantheon-systems/WordPress/tree/default/.circleci) that copies `default` to `master` after removing the CI directories. This allows customers to clone from `master` and implement their own CI without needing to worry about potential merge conflicts.

## Custom Upstreams

If you are using this repository as a starting point for a custom upstream, be sure to review the [documentation](https://pantheon.io/docs/create-custom-upstream#pull-in-core-from-pantheons-upstream) and pull the core files from the `master` branch.

0 comments on commit 7e64349

Please sign in to comment.