I've noticed that often (not always) when I update my working directory
from the repo, I get conflicts on some *.gmo files.
I've been resolving the conflicts as shown in the transcript. Should I
be doing something different? Is there something that can make these
conflicts stop happening?
$ svn update
Updating '.':
U src/buildtag.hh
U src/Command.cc
U src/UserFunction.hh
U src/Output.hh
U src/Id.def
U src/main.cc
U src/PrimitiveFunction.hh
U src/SystemVariable.def
U src/Tokenizer.cc
U src/UserFunction.cc
U src/Avec.def
U src/Token.def
U src/Output.cc
U src/PrimitiveFunction.cc
U README-4-compliance
G po/e...@quot.po
G po/e...@boldquot.po
C po/e...@quot.gmo
C po/e...@boldquot.gmo
G po/de.po
C po/de.gmo
G po/apl.pot
U gnu-apl.d/preferences
U ChangeLog
Updated to revision 158.
Conflict discovered in file 'po/de.gmo'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: tc
tc
Resolved conflicted state of 'po/de.gmo'
Conflict discovered in file 'po/e...@boldquot.gmo'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: tc
tc
Resolved conflicted state of 'po/e...@boldquot.gmo'
Conflict discovered in file 'po/e...@quot.gmo'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: tc
tc
Resolved conflicted state of 'po/e...@quot.gmo'
Summary of conflicts:
Text conflicts: 0 remaining (and 3 already resolved)
