Oh Jacques you have my sympathy svn conflicts in such a merge can really be a pain. But I think you can handle it. Chucka :-)
Am 09.12.2010 um 19:35 schrieb "Jacques Le Roux" <[email protected]>: > At 1st glance it does not look like a quickly done task. There are 68 > conflicts to handle. 70% are tree conflicts, hopefully easier to handle... > > Jacques > > > From: "Jacques Le Roux" <[email protected]> >> Hi Rohit, >> >> As I already said, I hope to do it before the new year... >> I want at least to fix this before >> https://issues.apache.org/jira/browse/OFBIZ-4030 >> Fortunately you may help since it seems the issue is in the trunk, see my >> comment >> >> Also I will need to put a tag before the back merge to trunk. I wonder if we >> should not avoid to commit between these 2 events. In >> order to have not changes trapped bewteen, not a big deal if I can do the >> back merge quickly. So I will try locally before... >> >> Thanks >> >> Jacques >> >>> Hi Jacques, >>> >>> I guess everybody has agreed with the merger, so when can we can be expect >>> it to be done. I am sorry if i sound little haste, but we are very eagerly >>> waiting for it. >>> >>> thanks, >>> >>> Rohit >>> >>> >>> ----- >>> http://www.saanjhi.com saanjhi.com >>> -- >>> View this message in context: >>> http://ofbiz.135035.n4.nabble.com/jquey-tp3068464p3075960.html >>> Sent from the OFBiz - Dev mailing list archive at Nabble.com. >>> >> >> > >
