Merge files from a moved directory
From: Emiliano S <bunidano_at_hotmail.com>
Date: Sun, 27 May 2012 17:30:25 -0300
Suppose there's a directory with a single file in it:
While I'm modifying this file someone else modifies the file, renames
Before committing I try to update and get a tree conflict, status shows
A + C dirA
Now I have dirA and dirB in my working copy.
I'm using Subversion 1.6.12.
This is an archived mail posted to the Subversion Users mailing list.