-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Wed, Oct 24, 2007 at 02:32:13PM +0200, Martijn van Oosterhout wrote:
> On Tue, Oct 23, 2007 at 02:39:43PM -0700, David Fetter wrote:
> > The one below is already available, so we don't have to do a "flag
> > day" with it.
> >
> > http://repo.or.cz/w/PostgreSQL.git
>
> As someone who hasn't used GIT: if I have a modified CVS tree from some time
> back (>1 year) can I use this to manage the bitrot? Just doing a CVS
> update will probably just mark everything conflicted, so I'm wondering
> is GIT can do it better.
It's no magic, but three-way merges[1] and automatic tracking of file
renames do help quite a bit.
- ------
[1] most distributed SCMs keep enough info around to dig out the last
common ancestor of the two files to be merged and do then a three-way
merge, which is better at resolving conflicts than a naïve direct merge.
Regards
- -- tomás
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFHH2mpBcgs9XrR2kYRAg/uAJoCSjQ3GDIEZidWYG9IX5J7RF4N9QCfXp+i
614RlRkN38tPTBhZ9ctir0I=
=AsX7
-----END PGP SIGNATURE-----