merged branch mageekguy/master (PR #471)
merged branch mageekguy/master (PR #471)

Commits
-------

6d3e410 Use $app['db'] instead of $conn and add autoinc

Discussion
----------

Use $app['db’] instead of $conn and add an auto increment

`$conn` is not `$this->conn`and is identical to `$app['db'].
Moreover, column `id` must be auto-increment.

---------------------------------------------------------------------------

by igorw at 2012-08-28T13:08:50Z

Apart from that thing, looks good. :+1:

---------------------------------------------------------------------------

by fabpot at 2012-08-29T13:06:24Z

Can you squash your commits before I merge? Thanks.

---------------------------------------------------------------------------

by stof at 2012-08-29T19:55:15Z

@mageekguy when squashing, you need to force the push after that. Here, you merged your remote branch, meaning you kept all the older commits as well.

---------------------------------------------------------------------------

by mageekguy at 2012-08-29T20:06:49Z

Know it, but my push was refused because not fast-forward.
So i pull and push, with this result.
And i don't kown what to do know :/.

---------------------------------------------------------------------------

by igorw at 2012-08-29T20:32:21Z

You need to force push. Like this: `git push --force origin master`.

---------------------------------------------------------------------------

by stof at 2012-08-29T23:24:27Z

@mageekguy not being a fast-forward is expected when squashing as you are rewriting the history.

And in such case, git tells you about both solutions (merging and forcing the push). You choose the wrong one :)

---------------------------------------------------------------------------

by stof at 2012-08-30T09:42:38Z

hmm, looks like you messed something when rebasing

---------------------------------------------------------------------------

by mageekguy at 2012-08-30T11:13:46Z

Seems to be ok now.
Can you confirm ?

---------------------------------------------------------------------------

by stof at 2012-08-30T11:14:28Z

you still have 2 unrelated commits in the branch

---------------------------------------------------------------------------

by igorw at 2012-08-30T11:51:14Z

Now you need to fix that whitespace issue and it should be mergeable. :)

---------------------------------------------------------------------------

by igorw at 2012-08-30T12:48:02Z

Alright, now it looks good.

GromNaN/Silex,lokhman/Silex,silexphp/Silex,mmauri04/Silex,lokhman/Silex,SanderKnape/Silex,tcx1000/Silex,romainneutron/Silex,fhinkel/Silex,cgsmith/Silex,RayRutjes/Silex,cgsmith/Silex,romainneutron/Silex,fhinkel/Silex,JPry/Silex,akucherevskiy/developex_test,peterkokot/Silex,plotek/Silex,CarsonF/Silex,CarsonF/Silex,naderman/Silex,beealone/Silex,cesarmarinhorj/Silex,cesarmarinhorj/Silex,fabpot/Silex,SanderKnape/Silex,fabpot/Silex,Incognito/silex-fork,naderman/Silex,lyrixx/Silex,peterkokot/Silex,Tobion/Silex,CarsonF/Silex,mTorres/Silex,RayRutjes/Silex,akucherevskiy/developex_test,beealone/Silex,romainneutron/Silex,Incognito/silex-fork,mathroc/Silex,tcx1000/Silex,peterkokot/Silex,Xephi/Silex,naderman/Silex,gencer/Silex,SpacePossum/Silex,akucherevskiy/developex_test,arduanov/Silex,jdreesen/Silex,lyrixx/Silex,Tobion/Silex,plotek/Silex,GromNaN/Silex,Tobion/Silex,JPry/Silex,Xephi/Silex,arduanov/Silex,lyrixx/Silex,mathroc/Silex,SpacePossum/Silex,GromNaN/Silex,jdreesen/Silex,mTorres/Silex,mmauri04/Silex