I'm on Mac, and I thought I'd use Meld for merge conflicts. However,
this doesn't seem to work: http://stackoverflow.com/a/7418087.
What's the right way to do this with modern versions of SVN (1.9.5)
and Meld (3.16.0)?
Thanks,
Jamie
Hi Folks,
I'd like to file an enhancement request:
JavaHL doesn't seem to expose some necessary merge options. From the CLI:
-x [--extensions] ARG: Specify differencing options for external diff
or
internal diff or blame. Default: '-u'. Options
are
I have a dozen outstanding feature branches (based on the trunk), and
I need to rename a subdirectory. Since I've got so many branches, I
want to make sure I'm doing things properly.
Here's how I plan to do this, and propagate the change to the branches:
TRUNK
1. Rename the directory (and commit)
