On Mon, Aug 04, 2014 at 02:05:33PM +1000, Daniel Becroft wrote:
> Hi,
>
> Using: svn 1.8.8 (r1568071)
>
> When attempting to merge a change into my working copy, I am getting a tree
> conflict (change adds a file, file already exists). No problem with the
> conflict.
>
> Conflict discovered
Hi,
Using: svn 1.8.8 (r1568071)
When attempting to merge a change into my working copy, I am getting a tree
conflict (change adds a file, file already exists). No problem with the
conflict.
Conflict discovered when trying to add 'foo\A\B\c.p'.
An object of the same name already exists.
On 04.08.2014 05:25, Ryan Schmidt wrote:
> Note that it is a user error to attempt to check out the root of a repository.
That really depends on what the repository is for.
-- Brane
--
Branko Čibej | Director of Subversion
WANdisco | Realising the impossibilities of Big Data
e. br...@wandisco.
On Aug 3, 2014, at 10:43 AM, Chris Carman wrote:
> When I run the following checkout command, the directories are created as
> expected, but the checkout ends with an error:
>
> svn co https://github.com/NUKnightLab/TimelineJS --depth immediates
> ATimelineJS/branches
> A
I've searched for other occurrences/descriptions of this problem, but
haven't found any so far…
When I run the following checkout command, the directories are created as
expected, but the checkout ends with an error:
svn co https://github.com/NUKnightLab/TimelineJS --depth immediates
A
