Search found 2 matches

by clicktoy
Wed Jan 14, 2009 4:50 pm
Forum: Compare It! - Suggestions
Topic: rule-based line expansion
Replies: 2
Views: 7724

2way file converters

That's a very simple and practical solution. It would work just fine.. the conversion could easily put text begin/end anchors around any expanded lines for clairity. and the converter could be coded in any language you want. I like it! :)
by clicktoy
Fri Jan 09, 2009 11:20 pm
Forum: Compare It! - Suggestions
Topic: rule-based line expansion
Replies: 2
Views: 7724

rule-based line expansion

Working with perforce and branches, I often find myself manually merging vcproj files. If both myself and the other branch modified the same line, I get a conflict. With lines like "AdditionalIncludePath", they have a regular delimiter which essentially functions like "line breaks". If I could flag ...