[PATCH xserver 3/5] dmx/doc: resolve conflict between generated files also in git

[Keith Packard]

On Wed, 10 Feb 2010 14:10:29 -0500, Gaetan Nadon <memsize at videotron.ca> wrote:

> dmx.txt and scaled.txt are both generated and in git.

That seems like the fundamental problem. Generated files should not be
in git. Yes, I know generating them is a pain, but that's part of the
cost of doing business when making release tarballs.

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-devel/attachments/20100210/a780885f/attachment.pgp