i created a PR from add-mysql-gem branch please check it out
thank you

On Mar 19, 2014, at 2:04 PM, tcv-nguyen <notifications@github.com> wrote:

> In Gemfile:
> 
> > @@ -4,8 +4,8 @@ source 'https://rubygems.org'
> >  # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
> >  gem 'rails', '4.0.4'
> >  
> > -# Use postgresql as the database for Active Record
> > -gem 'pg'
> @lkaba2003 @NhanHuynh06 You don't have to remove this gem. Someone can use it so they can run postgresql database. So reverse this, run bundle again.
> 
> Redo this by:
> 
> From the master branch:
> 
>   git reset HEAD^
>   git checkout Gemfile
>   git checkout Gemfile.lock
>   git checkout -b add-mysql-gem
> From the add-mysql-gem branch: Add gem 'mysql2' back to Gemfile and run bundle again. Push to origin/add-mysql-gem branch, and create a Pull Request from that new branch.
> 
> Never update anything directly on master branch.
> 
> —
> Reply to this email directly or view it on GitHub.
>