[svnbook] r4976 committed - [de] Translation: Branching and Merging...

svnbook at googlecode.com svnbook at googlecode.com
Fri Feb 6 09:58:56 CST 2015


Revision: 4976
Author:   jmfelderhoff at gmx.eu
Date:     Fri Feb  6 15:58:40 2015 UTC
Log:      [de] Translation: Branching and Merging
Sections:
   ** More on Merge Conflicts (temporary version)

https://code.google.com/p/svnbook/source/detail?r=4976

Modified:
  /branches/1.8/de/book/ch04-branching-and-merging.xml

=======================================
--- /branches/1.8/de/book/ch04-branching-and-merging.xml	Thu Feb  5  
15:10:27 2015 UTC
+++ /branches/1.8/de/book/ch04-branching-and-merging.xml	Fri Feb  6  
15:58:40 2015 UTC
@@ -1263,7 +1263,6 @@
          zusammenführen.</para>

      </sect2>
-
      <!-- ===============================================================  
-->
      <sect2 id="svn.branchmerge.basicmerging.stayinsync">
  <!--
@@ -3572,6 +3571,16 @@
  r401 | sally | 2013-02-18 23:15:44 -0500 (Di, 19. Feb 2013) | 1 Zeile
  Geänderte Pfade:
     M /calc/trunk/src/main.c
+<!--
+Follow-up to r400: Fix typos in help text.
+-->
+Nachtrag zu r400: Tippfehler im Hifetext.
+------------------------------------------------------------------------<!--
+r400 | bill | 2013-02-19 20:55:08 -0500 (Tue, 19 Feb 2013) | 4 lines
+Changed paths:-->
+r400 | bill | 2013-02-19 20:55:08 -0500 (Di, 19. Feb 2013) | 4 Zeilen
+Geänderte Pfade:
+   M /calc/trunk/src/main.c
     D /calc/trunk/src/real.c

  <!--
@@ -3737,7 +3746,7 @@

        <informalexample>
          <screen>
-$ svn cat ^/calc/trunk/real.c at 807 > ./real.c
+$ svn cat ^/calc/trunk/src/real.c at 399 > ./real.c

  $ svn add real.c
  A         real.c
@@ -4935,21 +4944,23 @@
   U   .  <!--
  Summary of conflicts:
    Text conflicts: 1
+Conflict discovered in file 'Makefile'.
+Select: (p) postpone, (df) diff-full, (e) edit, (m) merge,
+        (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p
  -->
  Konfliktübersicht:
    Textkonflikte: 1
  Konflikt in Datei »Makefile« entdeckt.
+Conflict discovered in file 'Makefile'.
+Select: (p) postpone, (df) diff-full, (e) edit, (m) merge,
+        (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p

-C:\SVN\src-branch-1.7.x>svn st
+$ svn st
   M      .
-?       glub.c.merge-left.r1700
-?       glub.c.merge-right.r1701
-C       glub.c
-?       glub.c.working
-?       sputter.c.merge-left.r1700
-?       sputter.c.merge-right.r1701
-C       sputter.c
-?       sputter.c.working <!--
+C       Makefile
+?       Makefile.merge-left.r289
+?       Makefile.merge-right.r291
+?       Makefile.working<!--
  Summary of conflicts:
    Text conflicts: 2
  -->


More information about the svnbook-dev mailing list