Follow-up Comment #60, task #6847 (project relax): Hi Edward There is a conflict in merging the 1.3 line to the bieri_gui line after the command: svnmerge merge The gui_line is the latest version. Output: Summary of conflicts: Text conflicts: 1 Cheers Michael _______________________________________________________ Reply to this item at: <http://gna.org/task/?6847> _______________________________________________ Nachricht geschickt von/durch Gna! http://gna.org/