Commit 8104b627 authored by Dr. Martin Goik's avatar Dr. Martin Goik

Git «battle» image

parent 6b3773d5
...@@ -12670,6 +12670,17 @@ public class Print { ...@@ -12670,6 +12670,17 @@ public class Print {
</calloutlist> </calloutlist>
</figure> </figure>
<figure xml:id="sd1_fig_gitMergeBattle">
<title>Struggling for resolution</title>
<mediaobject>
<imageobject>
<imagedata fileref="Ref/ObjectsAndClasses/Git/gitMerge.gif"
scale="200"/>
</imageobject>
</mediaobject>
</figure>
<figure xml:id="sd1_fig_gitManualMerge"> <figure xml:id="sd1_fig_gitManualMerge">
<title>Merging <filename>Print.java</filename> manually</title> <title>Merging <filename>Print.java</filename> manually</title>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment