Changes between Version 5 and Version 6 of TracL10N/Transifex

Timestamp:

Nov 1, 2012, 8:23:30 PM (11 years ago)

Author:

Christian Boos

Comment:

s/pull/push/

TracL10N/Transifex

@@ -418 +418 @@
 Even if you just pulled changes from Transifex (coming from the other example above), you most certainly did  local adaptations like the removal of the spurious metadata changes, or small fixes, then you should also push those changes back to Transifex the same way, as Transifex **won't** pick up the changes made to the translated catalogs from the repository (it will do that for the catalog templates though, so the latter are always up-to-date).
 
-But if you didn't do a pull just before, doing a pull //might// overwrite changes contributed to Transifex, so you should be careful. The safest thing to do is to simply  do an update first, normalize the changes by running `make update-..`, compare, and //only then//, if there are no changes but spurious ones in the metadata in the comments in the header, do the push.
+But if you didn't do a pull just before, doing a push //might// overwrite changes contributed to Transifex, so you should be careful. The safest thing to do is to simply  do a pull first, normalize the changes by running `make update-..`, compare, and //only then//, if there are no changes but spurious ones in the metadata in the comments in the header, revert those spurious changes and do the push of your committed state. If the changes were significant, you're simply back to the [#pull-example] situation described before.
 
 {{{#!console