Alex Rivera | Logout

Questions tagged tree-conflict

3 questions

Sort by: Newest Votes Active
55
votes
5
answers

SVN how to resolve "local add, incoming add upon update" on a *folder*?

svn tree-conflict
asked 2010-10-21T08:19:34.750
55
votes
6
answers

SVN - unable to merge branch back into trunk - numerous tree-conflicts

svn merge tree-conflict
asked 2009-06-17T18:06:57.467
96
votes
4
answers

SVN how to resolve new tree conflicts when file is added on two branches

svn merge tree-conflict
asked 2009-04-20T10:49:25.803