Staging, production, development branch (what am I doin' wrong?)

So, I have a development, staging, and master branch. And I have an heroku host for staging and production.

Now I lets say I do the following:

  • manifest missing or unreadable — please run init
  • How do I debug git error: “Your local changes to the following files would be overwritten by checkout” when there's nothing to stash?
  • Installing modules for Perl 6 using Panda but behind a proxy
  • Which format is github id_rsa.pub in?
  • How do I install subtree that ships with official Git install?
  • How to Manage Git Branches that Reflect Testing Environments
  • git checkout development
    make some changes 
    commit -a -m them and push them.
    

    then I run

    git checkout staging
    git merge development
    

    and I get the following error:

    Auto-merging app/views/devise/registrations/new.html.erb
    CONFLICT (content): Merge conflict in app/views/devise/registrations/new.html.erb
    Automatic merge failed; fix conflicts and then commit the result.
    

    Why is this?

  • git command could not be found and could not find ssh-agent
  • Change color of GIT branch in OS X terminal
  • Drawables won't push to github Android Studio
  • on mac git clone over https fails to authentication
  • Git: Commit whitespace refactoring without overwriting history
  • Git - to fork or not to fork
  • One Solution collect form web for “Staging, production, development branch (what am I doin' wrong?)”

    Git is telling you that you have a conflict in the following file app/views/devise/registrations/new.html.erb that Git cannot resolve by itself.

    This happens when you performed a change on the same file from 2 different branches. If the changes are too close together or too similar, Git could have issues merging them.

    Simply edit the file app/views/devise/registrations/new.html.erb to remove the conflict and help git merging the file.

    Git Baby is a git and github fan, let's start git clone.