Quoting Michał Kułach ([email protected]): > If you think about something like this: > $ svn update > Conflict discovered in 'xxxx.po'. > Select: (p) postpone, (df) diff-full, (e) edit, > (mc) mine-conflict, (tc) theirs-conflict, > (s) show all options: > > you can just ignore a version from the repo (enter "mc" in prompt), and > next run: > $ make update-po LINGUA=xx > to manually refresh your locally changed translation. Now you can > update it and commit without any conflict :)
Yes, that would have been my recommendation.
signature.asc
Description: Digital signature
