[SVN-3319] Allow merging into a tree-conflicted file

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Invalid
• Affects Version/s: trunk
• Fix Version/s: ---
• Component/s: unknown
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Julian Foad
• Created: 12/Nov/08 13:10
• Updated: 27/Oct/18 16:35
• Resolved: 21/Nov/08 10:48

Description

"svn merge" must have a way to ignore "already in conflict" flags so we can use
"merge" to help resolve a tree conflict.