git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Inheritance of files for parent/child branches

From
Jeff King <peff@peff.net>
Date
Feb 16, 2008, 18:39 UTC
Message-ID
<20080216183925.GA20914@sigill.intra.peff.net>
In-Reply-To
<alpine.DEB.1.00.0802161224160.32252@an.sumeria>
On Sat, Feb 16, 2008 at 12:33:42PM -0600, Adam Flott wrote:
> Your example is basically the only solution I could think of that would work
> with git. This repository will be for configuration files, where I want the
> parent to always "win" with conflicts.

Ah. That's much easier then. Instead of doing a real merge, you can just checkout from the parent every file that has changed between the merge base and the parent, and then make a new merge commit based on those contents. And then the "merge" always succeeds.

-Peff
Previous: Adam Flott
Message 4 of 4 in “Inheritance of files for parent/child branches”
  1. Adam FlottFeb 16, 2008
  2. Jeff KingFeb 16, 2008
  3. Adam FlottFeb 16, 2008
  4. Jeff KingFeb 16, 2008

Read the whole thread, see it on lore, or plain text.

$ 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.