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