Resolving conflicts (aus: http://gcc.gnu.org/wiki/SvnBasic) In SVN, the conflict status is sort of 'sticky': after a conflict is detected, SVN remembers that the file is in conflict status. Let's see an example: $ svn up U gcc/global.c C gcc/relo... Weiter »
