如何忽略 tortoiseSVN 中的冲突 [英] How to ignore conflicts in tortoiseSVN

查看:23
本文介绍了如何忽略 tortoiseSVN 中的冲突的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!

问题描述

我正在开发一个 Visual Studio 项目,我知道当我更新时,我可以忽略某些类库中的 bin/obj 文件夹中出现冲突的情况,因为无论如何我都会重建 dll.我只是不知道如何让 SVN 开心并告诉它忽略冲突 - 我想进行全局"忽略,所以我不必每次更新时都忽略,但有助于做一个简单的忽略也会有帮助.谢谢.

I am working on a Visual Studio project and I know that I can ignore when conflicts arise in the bin/obj folders in some Class Libraries when I do updates, since I will rebuild the dll's anyway. I just don't know how to make SVN happy and tell it to ignore the conflicts - I would like to make a 'global' ignore so I will not have to do ignore every single time I update, but help in doing a simple ignore would be helpful as well. Thank you.

推荐答案

为什么首先生成的组件在源代码控制之下?

Why are the generated components under source control in the first place?

更简单(也可能更合适)的做法是从源代码管理中删除生成的对象.

The easier (and probably more proper) thing to do would be to remove the generated objects from source control.

这篇关于如何忽略 tortoiseSVN 中的冲突的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!

查看全文
登录 关闭
扫码关注1秒登录
发送“验证码”获取 | 15天全站免登陆