Heads up on a prospective merge conflict

Alex Buckley alex.buckley at oracle.com
Wed Mar 13 17:44:35 PDT 2013


At some point in March, you may see a merge conflict when you pull from 
jdk8/tl/jaxws into type-annotations/type-annotations/jaxws.

A file in the jaxws repo, ApNavigator.java, is affected by new methods 
in the language model API. Jon fixed the file in the type-annotations 
forest [1]. The JAXWS team is fixing the file independently and will 
push it to jdk8/tl/jaxws as part of a larger source drop sometime in 
March. The fixes are likely to be very similar, but not identical. By 
all means resolve the conflict in favor of the parent (jdk8/tl/jaxws).



More information about the type-annotations-dev mailing list