Hi Pierre, We will try to minimize these issues, however this is trunk, which is by default unstable. Having your CIs always catching the latest commit might not be the best idea if you are trying to build solutions.
On Aug 15, 2016 8:32 PM, "Pierre Smits" <[email protected]> wrote: > HI all, > > Over the past few weeks I am experiencing conflicts after an svn upgrade > due to commits to build.gradle. These conflicts happen not only in my dev > environment, but also in the various CIs I have testing against trunk. Each > time this happens I lose precious time to fix all this. > > Can we collaborate to get something in the code repo so that these > conflicts won't happen again? > > Best regards, > > Pierre Smits > > ORRTIZ.COM <http://www.orrtiz.com> > OFBiz based solutions & services > > OFBiz Extensions Marketplace > http://oem.ofbizci.net/oci-2/ >
