That's out of scope
That's out of scope
Posted Apr 23, 2016 23:58 UTC (Sat) by xuv (guest, #108358)In reply to: That's out of scope by ksandstr
Parent article: Git for design projects
Totally agree with you that it would be better to have file formats designed to be diffable. Now, as you demonstrate it, even for code, the actual diffing used by Git has its limitations. There is some plain-text file formats for design files (sometimes XML-based) and there is diffing algorithms for XML. Now that does not mean it will make sense from a design point of view, but it's worth a try. There's also merge conflicts with just plain text code anyway.
The point here is not to change Git, but as others have done, to build tools on top of it. Would it kill Git? I doubt it.
The point here is not to change Git, but as others have done, to build tools on top of it. Would it kill Git? I doubt it.
Posted Apr 24, 2016 10:12 UTC (Sun)
by dlang (guest, #313)
[Link]
That's out of scope
in git-attributes you can set a custom dif/merge tool to be used for specific files. So if you have tools that can handle the format, git can be smarter about reporting the changes.