loadsys / loadsys/CakePHP-Skeleton
Staying in sync with cakephp/app
@ricog is already working on this.
Since Feb 13, 2015.
- Dominant language
- PHP
- Stars
- 10
- Forks
- 1
- PR merge metrics
- No merged PRs in 30d
Description
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
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?
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Assessment
This issue has not been assessed yet.