Brice -- So now I'm getting a slew of conflicts--basically all of lib/puppet/type/file.rb--because (I think) of Luke's "Fixing File type indentation" commit in his events branch. We hope to graduate that branch soon (so it will be the tip of master), and I suspect the best way forward will be to hold off until that's ready and then ask you to rebase on master. Sound reasonable?
-- Markus -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to puppet-...@googlegroups.com. To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
