Hi,
I'm really happy to see that we're moving towards our webtools actually
reading back from version control. We have code in pontoon, and pootle's
on the way.
I'd like to get to an agreement on what those tools do in times of
conflict between a local edit and a remote edit.
Now both teams were nice enough to document what happens, so let's see:
http://mozilla-pontoon.readthedocs.org/en/latest/dev/sync.html docs that
for new/removed entities, VCS wins, for edits to existing ones, pontoon
wins.
Pootle comes with a few commands and a few options to each, I guess
"anything goes". I like what I read on
https://github.com/translate/pootle_fs/blob/master/docs/workflow.rst#resolving-conflicts---merging,
i.e., VCS wins, pootle moves local edit to a suggestion.
I like this option on pootle because it blends nicely with "the
repository is king" while not throwing data away. It's also filling me
with less worries about massive technical edits or refactorings on the
repo side conflicting with the webtools.
How does that sound to you guys?
Axel
_______________________________________________
tools-l10n mailing list
[email protected]
https://lists.mozilla.org/listinfo/tools-l10n
