jhbuild failing due to cvs conflicts

["Gustavo J. A. M. Carneiro" <gjc inescporto pt>]

  Congratulations to the build team; nowadays gnome is more buildable
than before!

  However, there's one more major problem standing in our way to smooth
jhbuilding.  It seems that many modules are still producing cvs
conflicts in po files. For example:

RCS file: /cvs/gstreamer/gst-plugins-base/po/en_GB.po,v
retrieving revision 1.42
retrieving revision 1.43
Merging differences between 1.42 and 1.43 into en_GB.po
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in po/en_GB.po
C po/en_GB.po

  I am _sure_ I didn't personally change any gstreamer po file; logic
dictates that I should not therefore be penalized by cvs conflicts.
What's happening here?  Can it be fixed?

-- 
Gustavo J. A. M. Carneiro
<gjc inescporto pt> <gustavo users sourceforge net>
The universe is always one step beyond logic