db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thomas Mahler <thm...@web.de>
Subject Re: [CVS] how to merge fixes between main trunk and rc5 branch?
Date Fri, 19 Dec 2003 18:27:54 GMT
hi all,

I think we have to approach this branching business with some more care.
I just tried a merge between the branch and the trunk. I see several 
conflicts. They seem to be about version numbers only, but I simply 
don't understand how this could happen?

What do we have to do to to avoid such problems?


To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org

View raw message