Rob Vesse

At least it's only a minor irritation and not a potential major disaster like it would be with SVN - merge conflicts anyone?

http://twitter.com/RobVesse

11 years ago

Jason Kavanagh

Windows, branch, trunk, merge, commit #svn #braindead

http://twitter.com/dirtmerchant

11 years ago

Jared Blitzstein

If a tree falls in the woods, SVN still wants to merge it.

http://twitter.com/jcblitz

11 years ago

Alex Pasternak

@Zennaware Yes, please add @kaleidoscopeapp support, and soon. Can't really demo SVN merge & diff functionality in 15-day trial otherwise.

http://twitter.com/AlexPasternak

11 years ago

Alex Pasternak

@kaleidoscopeapp In Cornerstone 2.7 SVN, I'm only able to set K as diff tool, not merge. Can this be fixed? Really need both to switch.

http://twitter.com/AlexPasternak

11 years ago

Aidan de Graaf

Running SVN merge for the first time in 1.5/2 years. It's like someone turned out the lights, spun me around & kicked me in the balls.

http://twitter.com/degraaf

11 years ago

Scott F. Walter

I love kaleidoscope from http://t.co/ULYbXyPO as my new goto diff/merge app. Works seamlessly with git and svn. #mac #app

http://twitter.com/scottfwalter

11 years ago