automatic merging of "set of lines" text files with a specific git merge driver (union?)
dieter at plaetinck.be
Mon Feb 21 21:24:16 CET 2011
On Mon, 21 Feb 2011 17:42:47 +0000
seanh <snhmnd at gmail.com> wrote:
> I think the merge algorithm would just be whatever git currently uses,
> except that it would use patience diff to produce the diffs that are fed
> into the merge algorithm.
> I haven't been using it as I haven't got it working with git, although I
> think it should be doable with a simple custom merge driver or git
> patch. But when I briefly tested merging my log.txt file with bzr (which
> uses patience diff by default when merging) I found that it merged the
> file correctly automatically. So a quick way to try it out for your use
> case might be to test with bzr.
hmm according to `man git`, it supports patience diff as option for the recursive strategy (which is default for 3-way merges)
in other words:
`git merge -X patience` should work.
I'll experiment a bit more..
More information about the vcs-home