Why git shows a merge conflict when the HEAD version has no content at the line...

Tee conflict caused by delete/re-add...

svn tree conflicts: what am i doing wrong?...

How do I reintegrate a feature branch with broken merge history in SVN?...

SVN: How to resolve evil twins tree conflict by accepting incoming add (removing local add)...

TortoiseSVN approaches to resolve Tree Conflicts...

How to solve subversion tree conflict: branch removed a directory and trunk changed a file there...

SVN Merge with tree conflict problem...

How exactly to do a Subversion pre-1.5 style merge?...