RamCharan Vemulakonda writes: > Hi Philip, > > By DataStage Artifacts, I meant .dsx files that are composed of IBM > InfoSphere DataStage Job definitions. A .dsx file is simply an xml and > is usually light-weight but has metadata within it which makes it > risky to do a code merge unlike Java.
What you describe is generally true for *all* XML-based formats, merging is risky when using (line-based) tools that are developed for merging source code. AFAICS there are two options: 1. Make git treat .dsx files as executables, i.e. never merge them automatically, or 2. Configure git to use a .dsx/XML-aware tool for merging (see gitattributes(5) for details) /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus As far as the laws of mathematics refer to reality, they are not certain, and as far as they are certain, they do not refer to reality. -- Albert Einstein -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Description: PGP signature