PSR-0 is so 2010 #274
PSR-0 is so 2010 #274
Conversation
|
Thanks for your work this weekend, I really appreciate it! |
|
I will redo this PR later this evening. I think there are too many
conflicts to rebase.
…On 16 Jan 2017 14:56, "Kanti" ***@***.***> wrote:
***@***.**** approved this pull request.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#274 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAcuYjXHoTwPicvdxzTfBIcJFpqmvtvtks5rS4UhgaJpZM4Lj33d>
.
|
|
@veewee All done. |
|
Thanks! I'll keep this one open for a while until the open PRs are finished. This way it won't be blocking other peoples code. |
|
@veewee That's not a good idea. This will conflict with their PRs but the reverse
is also true. It makes sense to merge whichever PR is ready whether it is
mine or theirs because nothing is gained by waiting; if that was the case
git would be poorly designed, but it is not.
As it turns out, all I had to do was rebase after all; git figured out the
rest, therefore that is all they will have to do. Hence you should merge
whichever PR is ready instead of waiting on unrelated PRs that haven't been
updated in months as you run the risk that I may be unavailable to update
this PR by that time.
|
|
Look, there's conflicting files again already. |
|
Point taken :) |
|
So now what do we do? This is most perplexing, isn't it. |
|
@veewee I rebased again in the hopes that you will merge this PR nextish. |
|
Hi @Bilge, No worries, this will be the next merged PR. I am quite busy this week, so this will be something for next week. I'll also try to provide some basic commands for rebasing the open PRs against the code in this one with some additional tips to make it as non-blocking as possible for the other contributors. |
|
If you're already committed to merging this next what is gained by waiting?
The command is `git rebase upstream/master`. It's that simple.
|
|
Finally merged ... Thanks again! |
PSR-0 has been deprecated since 2014-10-21. With the new PSR-4 structure we can enjoy eliminating redundant folders in the hierarchy that only contain one other embedded directory within them.