Pootle FS uses a set of statuses for the files or stores it manages, using these it is able to determine what to do to resolve the scenario.
There are two groups of statuses:
Statuses that need an action to be specified in order for Pootle FS to be able to resolve them:
conflict
merge
to merge the two and manage conflict
resolution. Or if you wish to discard one or the other use fetch
--force
or add --force
to keep the
filesystem version or Pootle version respectively.conflict_untracked
merge
to combine the translation and manage
conflict resolution for each unit. Or to force taking the whole file or store
use either fetch --force
or add --force
depending on whether you want to keep the filesystem file or
the Pootle store.pootle_untracked
add
to create the file on the
filesystem and push the translations on the store to it, or alternatively use
rm
to stage the store for removal.fs_untracked
fetch
to pull the file into
Pootle or alternatively use rm
to stage the file for removal.pootle_removed
fetch --force
to restore the filesystem version, or use rm
to
stage for removal from filesystem.fs_removed
add
--force
to restore the Pootle version, or use rm
to
stage for removal from Pootle.These statuses reflect changes that can be either unstaged by using
unstage
or executed with sync
:
pootle_ahead
sync
will push the changes to the filesystem.fs_ahead
sync
will pull the changes to Pootle.pootle_staged
sync
will create the file on the filesystem.fs_staged
sync
will create the store on Pootle.merge_pootle_wins
merge_fs_wins
remove
sync
will remove the file or store.both_removed
sync
will remove both the file and
store.