Web lists-archives.org

Re: [PATCH] Documentation: mention how to define multiple strategies

Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes:

> pull.twohead and pull.octopus supports multiple default strategies but
> this was undocumented and it was not obvious how to do so.

It indeed is supported to give multiple strategies and let "git merge" try
each of them.

However, I have a very strong doubt if it is really worth keeping the
support, let alone advertising it.

Really.  It was a fun experiment while it was being invented, but I never
saw any practical usefulness with it.

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html