The following untracked working tree files would be overwritten by merge

I have two different remote branches that I push to. One is to acquia (git push acquia dev) and one is github (git push origin dev).

Before I can push to acquia however I have to run a git pull. When i run "git pull acquia dev" I get

The following untracked working tree files would be overwritten by merge: docroot/sites/default/files/box1.jpg docroot/sites/default/files/box3.jpg docroot/sites/default/settings.php

Now, I don't want to overwrite these files (they are in my gitignore), I just want them to be ignored. How do i merge the branches so that they can be ignored?

链接地址: http://www.djcxy.com/p/19456.html

上一篇: git checkout：未结束的工作树文件将被checkout覆盖

下一篇: 通过合并覆盖以下未跟踪的工作树文件