This will eliminate the need to maintain the cakephp-app branch and the cakephp-app-previous tag in the skeleton repo. Applying the patches will become more manual as the repositories diverge. Passing in the --reject flag to am will preserve cleanly applied chunks. At each step, the patch is stored in .git/rebase-apply/patch.
This will eliminate the need to maintain the
cakephp-appbranch and thecakephp-app-previoustag in the skeleton repo. Applying the patches will become more manual as the repositories diverge. Passing in the--rejectflag to am will preserve cleanly applied chunks. At each step, the patch is stored in.git/rebase-apply/patch.