The main branch vs ca main branch

The main branch will have changes that are general and ideally could be merged back into the original repo https://github.com/GSA/openacr.

The ca-main branch will have CivicActions (CA) specific changes include custom branding and use of the company npm organization.

Merging changes between branches

The CA branch, ca-main should never be merged into main.

When changes from main are needed in ca-main, create a merge request from main to ca-main, review the changes and merge them. Resolve conflicts as they arise (might to create an intermediate branch to do that with) and also deploy the changes to the npm package after merging. Examples:

• Merging from main to ca-main: https://github.com/CivicActions/openacr/pull/8.
• Merging from an intermediate branch to ca-main: https://github.com/CivicActions/openacr/pull/12.

Note: If a pull request cannot be created to merge changes from main to ca-main then the merge can be done locally and pushed up that way.