Hacktoberfest 2026: the issues maintainers tagged for October, open and beginner-friendly. Browse Hacktoberfest issues

Staying in sync with cakephp/app

Open
  • Is something wrong?
#87 8 comments 0 reactions 1 assignee View on GitHub

@ricog is already working on this.

Since Feb 13, 2015.

Assessment

This issue has not been assessed yet.

Description

enhancement focus wip

Just dumping my thoughts before I go eat. The last sync was at:

cakephp/app: ea476366148e71bcfc3f346fedb450516104bb6b

So what I did is generate a patch between the last merge and now with this command run in a cakephp/app clone:

git format-patch ea476366148e71bcfc3f346fedb450516104bb6b --stdout > app.patch

I then take this patch and apply it on our repo.

git checkout <last merge of cakephp/app>
git checkout -b f/app-update-74c9759615fbcfe4fea7cb4e2d4baa1815d2b75b
git apply --stat app.patch
git apply --check app.patch
git am --ignore-whitespace --signoff < app.patch

This should place the commits into the new f/app-update-74c9759615fbcfe4fea7cb4e2d4baa1815d2b75b branch. I used this branch name to ensure the last cakephp/app hash is retained when we merge. Next it can be rebased onto our work and any conflicts can be resolved.

git rebase origin/master

Now push and create a PR (I made #86).

These instructions should probably live in the README.md of the skeleton. Also, it might be useful to keep a reference of the last hash merged into the skeleton too. Thoughts?

Dominant language
PHP
Stars
10
Forks
1
No merged PRs in 30d

Getting set up

We have not checked this project's setup files yet. Start from its README, and see our first-contribution guide for the general steps.

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

More from loadsys/CakePHP-Skeleton

All issues in loadsys/CakePHP-Skeleton

Similar issues

More PHP issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.