Well, since neither of us edited the file in question, we can't know with
certainty what is correct, but I think we can get close enough.
Generally development adds code as opposed to removing it. So if I see
code in one version and not the other, I figure the version with the code
was adding new functionality. If the lines are in both version but are
different, I try to keep the version that provides more functionality. For
example, some tokens that originally matched static text appeared to have
been updated to use regular expressions for matching.
For one of the files, there was a completely different xml element at the
same spot in the two versions. I just kept both lines, figuring both
version just happened to be adding different xml elements in the exact same
location.
Anyways, most of the time you won't have to worry about this, since it's
actually rather rare to have your changes collide with someone else's
changes resulting in a failed merge. Many times, even when two people are
editing the same file, they are editing different areas of the file and the
changes can be merged automatically with diff tools. I would say that you
were just "lucky" this time. :)
Ryan
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel
