Changing cookbook/ deployment info #3965
Conversation
Added"Check requirements as A in Common Post-Deployment Tasks
Added changing favicon to Other things - Common Post-Deployment Tasks
| @@ -36,6 +36,8 @@ There are several ways you can deploy a Symfony2 application. | |||
|
|
|||
| Start with a few basic deployment strategies and build up from there. | |||
|
|
|||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Please remove these blank lines.
|
The lowercased headlines were not introduced by you. But it would great if you'd change them too. |
|
Done. |
|
@j00seph Could you please also rebase your branch? |
|
@xabbuh it doesn't have conflicts |
|
@wouterj No, but at least for me GitHub fails to display the file diff. I hoped that rebasing would solve that issue. |
|
@xabbuh I don't have that issue |
|
@xabbuh - are you sure that this problem isn't on your side ? (i don't know - browser cache etc. ) ? |
|
@j00seph Seems so to be. Though all other pull requests work as expected. Nevertheless, I managed to have a look at the diff using another browser. Looks good so far. |
|
@j00seph Can you try rebasing again (or maybe open a fresh PR)? GitHub shows a lot of extra commits, which might not be a problem, but more strangely, when I try to merge, it says that you've made changes to Thanks! |
|
rebased - try now |
| @@ -1 +1 @@ | |||
| Subproject commit 03bc1c60172a280619e3476f22b111b4a187895d | |||
| Subproject commit 74553741a70af2b862de77e1de12fb2f74ff33a4 | |||
There was a problem hiding this comment.
I think there is a rebase problem again
There was a problem hiding this comment.
this is probably because the submodule was not updated locally to match the version used in master, and git add . was used when resolving conflicts during the rebase, adding the submodule target change to the diff
There was a problem hiding this comment.
hmm, actually, the rebase is totally messy: the upstream commits have been rebased instead of rebasing the branch on top of upstream commits. Look at the list of commits in the PR. This is why this appears in the diff
|
@j00seph could you please execute the following commands: (I assume "origin" remote refers to this repo and "j00seph" remote refers to your fork) After this, create a new PR for the "checking-server-requirements" branch to symfony:2.3 |
|
@wouterj the right command to base the branch on 2.3 is |
|
@j00seph Can you follow Wouter's directions (except change the What I'm ultimately looking for is to see just your commits under the Commits tab :). Thanks! |
|
give me day or two , i'm out of time at this moment :) |
|
I did the rebasing for you in #4124 Thanks for submitting your changes to the Symfony repo! |
Added info in cookbook in deployment about checking server requirements php app/check.php