Re: write-tree is pasky-0.4

From: Paul Jackson <pj@engr.sgi.com>
Date: Apr 16, 2005, 06:59 UTC
Message-ID: <20050415235941.73f8a007.pj@engr.sgi.com>
In-Reply-To: <Pine.LNX.4.58.0504152000570.7211@ppc970.osdl.org>

One trick I've used to separate good automatic merges from ones that need human interaction is to run both the 'patch' and 'merge' commands, which use different approaches to determining the result.

If they agree, take it. To apply the changes between file1 and file2 to filez:

	diff -au file1 file2 | patch -f filez
	merge -q filez file1 file2

-- 
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <pj@engr.sgi.com> 1.650.933.1373, 1.925.600.0401

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.