On Thu, Nov 13, 2008 at 11:03:38AM +0200, Wynand Winterbach <[EMAIL PROTECTED]> wrote: > Updating b219733..69c409c > abc.po: needs update > error: Entry 'abc.po' not uptodate. Cannot merge.
There is an easy solution for this: ask your users to commit before they update. The problem is that git expects that local changes are committed or dropped away before you pull, usually.
pgpQXudrtVSVe.pgp
Description: PGP signature
------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________ Translate-pootle mailing list Translate-pootle@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/translate-pootle
