Includ plugin works.

[KamilSzot]

No description provided.

[Seldaek]

No need to do a new pull request btw, commits are automatically added to the other one on a per-branch basis, which is why you should always do pull requests from new (feature/fix) branches rather than master btw.

[KamilSzot]

Thanks for info. I'm pretty unexperienced with git and github.

[Seldaek]

No problem, I've been struggling with it myself a few months back. The main problem here is that you now have changes in your master branch that are not really in sync with my master. That's why you should really use new branches for all the pull requests. You can read the last two section on that page that might help you understand a bit what to do:

http://docs.symfony-reloaded.org/contributing/code/patches.html#working-on-a-patch

And to fix your current master, I think you should do :

git remote add upstream git://github.com/Seldaek/Dwoo.git
git fetch upstream
git rebase -i upstream/master

Then it'll show you a list of all your commits, delete them all from the file and just add a line on top with "noop" to tell it to rebase nothing on top. This should restore you a clean copy of my master, which contains your patches anyway (except the ones you reverted since that was a bit pointless).

[KamilSzot]

Maybe I'll better just delete this fork and create a new one, keep my master branch clean, and do all my experiments in new branches?

[Seldaek]

Yeah that's the easy way to go to restore your fork. And in the future yes, you should keep your master clean imo so you can always re-sync from mine on to your master and then have patched stuff on other branches. Makes it a bit easier.