True that the merge conflicts bring attention to the changes in views, but in order to recover from the conflict I have to add the view, commit it, continue with the pull/merge then git rm them again. It's just a less than ideal process.
Michael-- On Sep 27, 2008, at 11:44 AM, Chris Eppstein <[EMAIL PROTECTED]> wrote: > > I don't know of a way, but I've not really looked. But it sounds like > you're doing it wrong. If you're deleting files and reformatting them, > you _WANT_ merge conflicts so that you can move the changes to your > new files. > > chris > > On Sep 27, 7:25 am, Michael Moen <[EMAIL PROTECTED]> wrote: >> Is there a way to define the order that templates will be used? >> >> If I have home/index.html.erb and home/index.html/haml, can I get it >> to use the haml file instead of the erb? >> >> I looked through the code and didn't see where haml might be setting >> this, maybe it's something at the rails level? >> >> I forked bort and made it use haml by default but merges get real >> ugly >> if I delete the erb templates. >> >> Thanks in advance, >> Michael > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Haml" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/haml?hl=en -~----------~----~----~----~------~----~------~--~---
