Axel is right. The WIP page is to avoid two (or more) people working in
the same directory (unless they come to an agreement since there are
often hundreds of files in a directory).
On the other side, we can't avoid all conflicts because working on a
file sometimes needs modifying a file in another directory. But we must
limit these conflicts to one or two files IMHO.
Greetings.
Julien
Axel Wernicke a écrit :
commit early, commit often.
AFAIk the wip page is just an anouncement to avoid that lots of folks work in the same area of the manual.
just my 2c
btw. when I do commits, I've to merge manually sometimes too...
greetings, lexA
-------- Original-Nachricht --------
Datum: Wed, 11 Oct 2006 10:32:09 +0100
Von: "Vitaly Lomov" <lomovv@xxxxxxxxx>
An: gimp-docs@xxxxxxxxxxxxxxxxxxxxxx
Betreff: [Gimp-docs] work in progress
the work in progress wiki page clearly stated that the render filter
folder was pegged by 'ru' in the 'doing' status and 'it' in the
'done'. Imagine my surprise (I contribute the 'ru' part) when 5 files
in the render folder were updated by 'it', making me go through all
those files and manually fix the conflicts. WTF?
Does work in progress even matter? If it does, the commiters must
respect wip and not commit the files if the corresponding translation
team did not peg the area being committed.
my 2 cents.
_______________________________________________
Gimp-docs mailing list
Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
_______________________________________________
Gimp-docs mailing list
Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs