On 05/04/10 23:04, Markus Roberts wrote: > 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?
OK, I'll wait the tip to end on master and I'll rebase. That might leave me the time to implement all your suggestions. Another option if you prefer is to rebase to the testing tip minus the code smells refactorings (but since the SHA ids changes on each testing rebuilds, it's not easy to rebase constantly on the testing tip). -- Brice Figureau My Blog: http://www.masterzen.fr/ -- 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.
