Nope. both systems use a line-based merge strategy. This issue is not isolated to haml and sass. The same happens when a developer introduces a new code flow, etc. Some text editors (vim, maybe emacs) understand the merge conflict markers and will use syntax highlighting to show the differences at a sub-line level...
chris On Wed, Jul 22, 2009 at 3:05 PM, Lorin Tackett <[email protected]>wrote: > > Say you have a Haml partial in version control, and you have more than > one person touching the same partial. Everyone is working on different > parts of the file. Let's also say that one person adds a div wrapper > to the top of the partial, then tabs everything below it and commits. > This just blew up the other developers' checkouts and created > conflicts, even if the other developers didn't actually modify any > dangerous lines.. > > Is there any way to have SVN or Git understand the whitespace-active > nature of Haml? > > > > --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
