Deciphering merge 'Tree Conflict' dialog
From: Stephen Oberholtzer <stevie_at_qrpff.net>
Date: Wed, 5 Nov 2014 15:34:19 -0500
I'm trying to bring a long-standing feature branch up to date from trunk,
I did this:
and at some point I get a dialog box that looks roughly like this:
=== - Edit Tree Conflicts - TortoiseSVN ======
Source Left: https://<host>/<repo>/trunk/data/afile.txt_at_725
That first line was not sanitized -- it literally says "add the file ''"
The problem is: I have no idea what this is actually trying to tell me.
What exactly is this dialog telling me?
-- -- Stevie-O Real programmers use COPY CON PROGRAM.EXE ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3090913 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2014-11-05 22:33:12 CET |
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.