Question

I’ve got a bare repo setup with the following branches:

dev
*master
stage
prod

I’ve cloned this to a working copy and issued the following commands:

git checkout -b stage remotes/origin/stage
git checkout -b dev remotes/origin/dev

What I need to do is push the entire contents of my staging branch into my dev branch. Basically, this is a first-time setup, and I started with pushing production code into a staging branch (worked flawlessly) and now I’m pushing my staging code into the dev branch.

The problem I’m encountering is a merge conflict on binary files. How do I tell git to not even LOOK at merge-conflicts, and instead just straight up copy over the contents of the stage branch into the dev branch?

Answer 1

Decided the simplest way to fix it was to do this:

clone the repo twice, once into a dev folder once into a stage folder
then

cd dev
git rm -rf *
git commit -a -m "take that n00b repo!"
git push
cp -r ../stage/* .
git add *
git commit -a -m "how you like dem apples??"
git push

Inelegant but it got the job done, and was a lot less painful than dealing with git’s merge conflicts.