White Lion Docs

PERC

Review Pipeline

git switch development

Pull down remote development branch.

git pull origin development

Resolve merge conflicts, save changes, and commit your work.

git add .
git commit -m "merge remote development with local development"

Now your local feature branch is ready to merge with development.

git merge my-feature-branch

Resolve all conflicts, save changes, and commit your work.

git add .
git commit -m "merge feature branch my-feature-branch with development branch"

WARNING

The development branch make contain works not found in the master, it's important to read the merge conflicts carefully to avoid development pitfalls.

Now you're ready to push your local development branch with the new features up to the remote.

git push origin development

Deploybot will begin a new build for based on the remote developmemt branch

In a few minutes you can check your work at https://percdev.wpengine.com/

Production Pipeline

Once you're feature branch has passed code review and is approved for launch check your pull request to see if it can be merged without conflicts.

TIP

If merge conflicts are present on the feature branch's pull request you can resolve this usually by the following steps:

git switch master
git pull origin master
git switch my-feature-branch
git merge master
git add .
git commit -m "merge master into my-feature-branch"
git push origin my-feature-branch

When there are no conflicts, merge your feature branch into master.

Deploybot will begin building to staging when the master branch is updated.

In order to push to production you must login to PERC's Deploybot account and click build manually.