-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 24.10.2011 16:12, Campbell Barton wrote: > This came up on IRC, just a hint to how I've done merges from recent > changes from trunk without having to sit there and resolve each > conflict manually (which is pretty much unworkable for recent changes) [[snip]] > > * View final diff to ensure all changes are ok.
Naturally, *before* committing compile with _all_ necessary options enabled, including game engine and whatever we include in release. Only when it _properly_ compiles: > * Commit Thanks, /Nathan - -- Nathan Letwory Letwory Interactive | Studio Lumikuu http://www.letworyinteractive.com | http://www.lumikuu.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJOpaE7AAoJEKtfN7KsE0TtK04H/0Yv4fECL+1APbFF5/Cy5N/U gCzdE+39Zq441GGqiV+M+0vZvOhm6YXrqrec7PN30TzeMfifDqHvwngw2dmmZV6z v8Nqx5EqapIp3SjvQdUMQe/dNZdnmbzMFk8modL7mrGMmaLrr93V/10AcxpvBYPU 4TDhkiDVnRpzKx6RQ7mGVkK//myba4/g9FgFVq2Ji2h03IuLq1uaRGgGItSxg7/M W1vGag+n0OLkiUWYmfh4o4s86e2hd+0yFC9Rc0POODy2OZLo1xd7q+SW2xyBRgZQ +vcGWQzkad7P20vk6Vi313Q6ynl2NOF+tonaE9TQD8VDYFrpG/4LgFGOTvIAD/0= =eZQy -----END PGP SIGNATURE----- _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers