search

beberlei / AcmePizzaBundle

Acme Form Experimental Bundle
131 stars 27 forks source link

Bundle suffix less #5

Closed brikou closed 13 years ago

brikou commented 13 years ago

I've corrected the typo to conform to the latest symfony changes. Bundle now uses short name... I'm sorry but I have some trouble to ask for correct PR so consider only the lasts 2 commits. Of course, we should wait for @bschussek to merge the last change of symfony about bundle short names ;)

stof commented 13 years ago

@brikou Your issue for the PR is due to the fact that your master branch diverged from beberlei's one. The good solution is to use topic branches for the pull requests to keep a clean master branch. Once beberlei merged your commit, you will be able to make your master branch clean again by using git reset --hard upstream/master to reset your master branch (don't do it before as you would not keep the commits in the branch).

brikou commented 13 years ago

@stof thank you stof for the advice :)