#ubuntu-doc report for 2004-01-11, 12 and 13

[Enrico Zini]

* Solving conflicts

 <plovs> froud: in svn what do i do with a conflict? i tried to commit,
         but you committed already
 <froud> do you have kdiff3 or some other 3way diff tool
 <froud> just use it to resolve the conflict
 <froud> you need to examine my changes and yours
 <froud> resolve the conflict and then commit

I also suggest to have a look at 'meld' as a 3day merge tool.


* svn repository migration

Enrico contacted James Troup and they agreed that in a couple of days
(that is, around jan 13) they'll plan the svn migration.

The intention is to plan it with a scheduled downtime advertised with
one or two days of advance.


* Reorganized documentation about docteam

Froud reorganized the documentation he wrote about the docteam: it can
be found at the http://www.ubuntulinux.org/wiki/DocumentationTeamHome
wiki page.


Ciao,

Enrico

--
GPG key: 1024D/797EBFAB 2000-12-05 Enrico Zini <enrico at debian.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20050115/cd93861b/attachment.pgp>