Re: [tlug] VCS comparison [was: bash and grep and diff]

[Josh Glover <jmglov@example.com>]

On 16 August 2010 02:24, Stephen J. Turnbull <stephen@example.com> wrote:

> Josh Glover writes:
>
>  > One definite weakness was trying to integrate changes between
>  > unrelated branches was incredibly hairy.
>
> It is possible to have a really hairy merge conflict in git as well,
> and if you had "incredibly hairy" merges in Perforce, they'd be hairy
> in git, too, I suspect.

My complaint was more about the crazy syntax that you have to use (and
look up every time you need it) to make an unrelated merge work. In
git, you can just merge a file from any branch to yours without any
non-standard arguments. In Perforce, you need a few extra flags to "p4
integ" and a crazy path spec.

Cheers,
Josh