Hello forumers,

I am currently working on a Ruby on Rails application and I am running into some issues.

I am developing an application and I am trying to push the app to Heroku but first I ran into SQLite3-> Postgres issues, and now I have a merge conflict. I am pretty sure that I finally fixed my Postgres situation.

I would ask this on another site like Stackoverflow, but the site is already filled with the same topic, and I don't believe that any offers a solution to my particular issue (I've tried a handful of them).

Certain things I've tried doing;

git checkout HEAD -- Gemfile.lockgit push heroku master -f

I currently have an edit branch, and I must have made a change to the master branch by mistake.

I know this may be an odd topic for the forums, but I'm quite stuck.

Any help is greatly appreciated, and will be offered to anyone in the future.

Cheers

Edit:

Additional details. I am using Ruby 2.1.1 and Rails 4.2, and I am running on a box using Ubuntu 12.04