geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jeremy Boynes" <jer...@coredevelopers.net>
Subject RE: Standard @version tags
Date Wed, 13 Aug 2003 19:06:48 GMT
-kk I believe

http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_5.html#SEC64


> -----Original Message-----
> From: Aaron Mulder [mailto:ammulder@alumni.princeton.edu]
> Sent: Wednesday, August 13, 2003 1:34 PM
> To: geronimo-dev@incubator.apache.org
> Subject: RE: Standard @version tags
> 
> 
> 	Is there a good way to merge changes from a branch to the trunk 
> without getting conflicts on the $Revision$ ?
> 
> Aaron
> 
> On Wed, 13 Aug 2003, Bruce Snyder wrote:
> > I should have made a note about that because as I sent the message
> > I realized that for that reason alone I can understand why we didn't
> > use $Id$.
> > 
> > +1 for @version $Revision$ $Date$
> > 
> > Bruce
> > 
> 
> 

Mime
View raw message