Closed
Conversation
Member
|
👍 |
Member
|
This has some merge conflicts. |
aleixfabra
changed the title
Author
|
Conflicts solved. |
Member
|
Ideally, you could rebase and squash into a single commit here. |
The result of running: php-cs-fixer fix --level=psr2
The result of:
php-cs-fixer fix --fixers=phpdoc_indent
Which the fixer can't process since they contain parse errors in their raw format
Conflicts: src/Template/Bake/Element/Controller/delete.ctp
AD7six
added a commit
that referenced
this pull request
Dec 23, 2014
Member
|
That's quite a git-mess =). As it's one line, I applied the change manually. Thanks! |
Author
|
👍 |
ghost
mentioned this pull request
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Check allow method first and then do the rest. In this way, we don't need to execute get method. So we save execution time.