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,
+1 on "merge" support, as well as a related feature, "cherrypick"
On Wed, Dec 2, 2009 at 3:38 PM, mun wrote:
> workflow is entirely different but definitely +1 on "merge" support.
> .m
>
> On Dec 1, 1:54 pm, Zanfe wrote:
>> Hi all,
>> I'd explain my doubts.
>>
>> I usually have the stable versio
workflow is entirely different but definitely +1 on "merge" support.
.m
On Dec 1, 1:54 pm, Zanfe 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 v
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 an
