Git Hub GitIgnore错误 [英] Git Hub GitIgnore error

问题描述

 错误：对以下文件的本地更改将被merge覆盖：
 .gitignore 
  

如何让它忽略我的HOME目录中的.gitignore文件？

我的.gitignore看起来像这样并被忽略：

 ＃Can也忽略目录中的所有目录和文件。 
 app / config / ** 
 app / config / ** / * 
插件/ ** 
供应商/炮弹/ ** / * 
  
 
解决方案
 
不要忽视它。但承诺。没有理由不保存这个文件。
 
 
 
如果你提交并合并，合并将会（可能是正确的）添加你的规则和接收到的。 p> 
I keep getting this error:
error: Your local changes to the following files would be overwritten by merge:
    .gitignore
How do I make it ignore the .gitignore file in my HOME directory?

My .gitignore looks like this and is being ignored:
# Can also ignore all directories and files in a directory.
app/config/**
app/config/**/*
plugins/**
vendors/shells/**/*

解决方案
Don't ignore it.

But commit it. There is no reason not to save this file.

If you commit it and then merge, the merge will (probably correctly) add your rules and the received ones.

                        
这篇关于Git Hub GitIgnore错误的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！