告诉 Mercurial 在合并和更新时忽略文件
我希望 Mercurial 忽略我自己的 log/development.log 本地副本（我在 RoR 上）。
我使用“hg忘记文件名”来忘记该文件，然后提交该更改。
现在似乎成功了..但是每次我现在与其他变更集合并时，我都会看到
remote changed log/development.log which local deleted
use (c)hanged version or leave (d)eleted?
我做错了什么？我怎样才能让这条消息消失？我只是希望我的本地副本与存储库中的副本分开。
谢谢...
I want mercurial to ignore my own local copy of log/development.log (I am on RoR).
I used "hg forget filename" to forget the file, and then committed that change.
It seems to be successful now.. but every time I merge with other changesets now, I see
remote changed log/development.log which local deleted
use (c)hanged version or leave (d)eleted?
what am I doing wrong? how can I make this msg go away? I just want my local copy to be separate from the copy in the repository.
Thank you...
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
如果您删除了行中的文件，并将其与仍然具有该文件的文件合并，则会出现此消息。摆脱它的唯一方法是从您要合并的存储库/分支中删除此文件（或者让其所有者删除它，如果您不控制它们）。
然后永远不要再将临时日志文件提交到存储库中。
If you deleted the file in your line, and you merge it with the one that still has this file, this message is to be expected. The only way to get rid of it is to remove this file from the repos/branches you're merging with (or get their owners to remove it, if you don't control them).
And then never commit a temporary log file into the repository ever again.