Tortoise SVN - DLL conflicts

Question

I am relatively new to using the TortoiseSVN client. What do you do with binary files e.g. DLLs etc when merging?

Do you simply delete them from the project you are moving to or do you add them to the ignore list?

possible duplicate of [Best general SVN Ignore Pattern?](http://stackoverflow.com/questions/85353/best-general-svn-ignore-pattern) — bahrep, Jul 26 '13 at 11:13

score 3 · Answer 1 · answered Jul 23 '13 at 14:33

3

for bin files usually ignore it.

svn propedit

Add the following:

\src\   
\src\XXX\   
\src\XXX\bin\   
\src\XXX\obj\

answered Jul 23 '13 at 14:33

MG.

score 2 · Accepted Answer · answered Jul 23 '13 at 14:31

2

just add bin/obj folders to ignore list

answered Jul 23 '13 at 14:31

Sergio

Thanks +1. This has reduced the conflict list considerably. The suo file still conflicts. Is it ok to ignore that? – w0051977 Jul 23 '13 at 14:39
@w0051977 Yes, [you should ignore it](http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control) – alroc Jul 23 '13 at 14:41

2 Answers2