I've just had my first "tree conflict" when merging in SVN, I
had deleted some files from a previous revision that weren't present
when I merged so svn decided to tell me about them. I also had a few
other conflicts which I resolved.
No problem there - except I saw my directory had the little red
triangle on it for the conflict and it wouldn't go away - usually I take
the icon with a small pinch of salt as they sometimes don't refresh as
quickly as I'd like, and I thought this was the problem. However, not in
this case - the missing files were causing my directory to require a
So, I right-clicked and looked for the 'edit conflicts' menu
item, which doesn't exist. At this point I was a bit stumped as to what
to do, in the end I decided to just mark the directory as resolved, and
sort it out later - so I selected the 'resolved' menu item, and it
presented me with a little dialog of missing files that allowed me to
tell it those files were correctly missing.
What confused me is that for conflicted files, I have to edit
and then resolve them; for a directory I have to go straight to the
resolved command which allows me to 'edit' the conflicts. That didn't
seem to be best practice for usability. Is there a reason its done this
way, or do you think there should there be an 'edit conflicts' menu item
for conflicted directories?
Principal Application Engineer
Intergraph UK Ltd
SWINDON, Wiltshire, SN5 7XP. United Kingdon
P +44(0)1793 492416 F 1+44 (0)1793 694999 M 1+44 (0)7977 256882
<mailto:firstname.lastname_at_intergraph.com> , www.intergraph.co.uk
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-13 15:27:46 CEST