的git：不能將文件合併由於未知的.gitignore規則

Question

我被合併文件，但在完成合並3路，我看到了這一點：

Normal merge conflict for 'myfile.ext': 
    {local}: modified file 
    {remote}: modified file 
Hit return to start merge resolution tool (araxis): 
The following paths are ignored by one of your .gitignore files: 
Installers 
Use -f if you really want to add them. 
fatal: no files added 

而且git status給出：

Unmerged paths: 
# (use "git reset HEAD <file>..." to unstage) 
# (use "git add <file>..." to mark resolution) 
# 
#  both modified:  myfile.ext 

我試圖找到.gitignore，但它沒有結果。 在解決問題.gitignore文件之前，是否有辦法強制合併？

Answer 1

如果要強制合併到一個特定分支see this question

關於gitignore文件，請問下面舉？

git config --get core.excludesfile 

是Installers在那裏？