I use DiffMerge on OSX - its not anywhere near as polished.. and it takes a few steps.
http://www.sourcegear.com/diffmerge/screenshots.html Make sure you have both trunk/branch(s) you want to merge, open diffmerge, pick your source/target directories. then it will show you all the differences, and you can manually make the merges, then re- checkin. Its not fancy, and not without effort - but until merging is in versions app, this works for me. Phil On Dec 2, 5:48 pm, Joe Wicentowski <joe...@gmail.com> wrote: > +1 on "merge" support, as well as a related feature, "cherrypick" > > > > On Wed, Dec 2, 2009 at 3:38 PM, mun <munit...@gmail.com> wrote: > > workflow is entirely different but definitely +1 on "merge" support. > > .m > > > On Dec 1, 1:54 pm, Zanfe <andrea.zanferr...@gmail.com> wrote: > >> Hi all, > >> I'd explain my doubts. > > >> I usually have the stable version of my site in the trunk and I work, > >> for the updates, in a branch. > >> When I complete my updates I would put my branch version in the trunk, > >> but if I drag my files and directory on the trunk, Versions doesn't > >> overwrite the directories and so I can't overwrite the trunk. > >> So I try to export the branch version and put the exported files and > >> directories in the trunk but Versions doesn't like this operation and > >> doesn't permitt me to commit. > > >> The only way to be able to put my branch version in the trunk and to > >> commit it is to delete, form Versions, the trunck files, to commit, to > >> put exported branch files in the trunk, to add files and directories > >> and at last to commit the new trunk. > > >> Is it the only way to "merge" branch version with trunk version? > >> Is not possible, in some way, drag branch files and directories on the > >> trunk without problems? > > >> Thanks a lot > >> Bye > >> Z > > > -- > > > You received this message because you are subscribed to the Google Groups > > "Versions" group. > > To post to this group, send email to versi...@googlegroups.com. > > To unsubscribe from this group, send email to > > versions+unsubscr...@googlegroups.com. > > For more options, visit this group > > athttp://groups.google.com/group/versions?hl=en. -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
