0

我正在合并一个文件,但在完成 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 文件之前,有没有办法强制合并?

4

1 回答 1

1

如果您想强制合并到特定分支,请参阅此问题

关于 gitignore 文件,下面给出了什么?

git config --get core.excludesfile

Installers在里面吗?

于 2013-06-26T15:37:36.973 回答