On Sun, 25 Mar 2007, Johannes Schindelin wrote:
On Sat, 24 Mar 2007, David Lang wrote:
there's been talk about custom merge strategies for different types of
files (uncompressing office documents to merge them for example), so I
think this is along the same lines and wanted to let other people start
thinking about the problem and possible solutions.
There is a nice example script, named git-merge-stupid, which you can
use as template.
Basically, just write a program named "git-merge-david-lang", which takes
arguments of the form
merge-base [merge-base2...] -- head remote [remote...]
IOW, all arguments up to "--" are merge bases, and after the "--" comes
the HEAD and all branches to be merged. All of these argument (except
"--") are given as commit hashes.
IIRC, if no merge bases are passed, the program is expected to find out
(basically, take the output of "git-merge-base --all <head> <remote>...").
And I really prefer _you_ working on it.
I'll add it to my backlog of projects that I'd like to do someday ;-)
unfortunantly it's not likely to be anytime soon (too many things on the list
ahead of it)
David Lang
-
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