Re: Glossary: Spanish additions

[Graham Percival]

On Fri, 23 May 2008 10:48:36 +0200
John Mandereau <address@hidden> wrote:

> On 2008/05/23, Graham Percival wrote:
> > But please don't modify the glossary yourself; that will make my job
> > harder when I merge the next update.
> 
> Speaking of, do you mind if I go on applying technical changes to the
> documentation directly in Git?  I think this makes you less work, as
> Git does a conflict-less 3-way merge in most cases.

In most cases, this is fine.

In the NR, I can (relatively) easily see if a one-line change is
good, so conflicts are no problem.

In the MG, especially with other languages, I wouldn't be certain
if a conflict was due to Kurt updating a language, or from
somebody else updating a language and Kurt not having that update
in his file.  So please don't alter the MG.  If there's a
technical update needed, I'd rather do it myself just after
applying an update from Kurt.

Cheers,
- Graham