Re: Merge feature

2009-06-03 Thread bids.bax...@googlemail.com
Another +1 from me. We're a cross-platform shop so I tend to use TortoiseSVN on Windows to do merges, but a fast, integrated merge window would make Versions much nicer to use. On May 7, 5:15 pm, jcdesrochers jcdesroch...@gmail.com wrote: Just a quick question about Versions development road

Re: Merge feature

2009-06-03 Thread Quinn Taylor
Conflict resolution is a separate issue and feature from merge support — conflicts can occur even without branches or tags, and even with a single developer, so long as there are conflicting edits in multiple working copies. Out of curiosity, do other clients offer conflict resolution? In