Changes between Version 2 and Version 3 of TutorialVideos

Timestamp:

2007-06-14T23:57:24+02:00 (19 years ago)

Author:

imi

Comment:

--

TutorialVideos

@@ -1 @@
-=== Getting ===
+== Getting ==
 
 Just click on any link below the preview images of the videos.
@@ -6 +6 @@
  * If it doesn't work, download from the main site.
 
-=== Playing ===
+== Playing ==
 
 You may want to install the [http://de.techsmith.com/download/codecs.asp TSCC codec] to play the AVI-Versions of the video. For the OGG version, you need [http://theora.org/ OGG/Theora]. The Theora-Codecs are included in the excellent video player [http://www.videolan.org/ VLC], which comes with an installer for Windows.
 
 
-=== Introduction into JOSM ===
+== Introduction into JOSM ==
 
 This is a brief introduction on how to get starting with JOSM. It covers the installation of JOSM as well as the basic steps to get your first edit uploaded. Beware however, that this video is really outdated (was my first one), so many menus and dialogs look different now.
@@ -29 +29 @@
 [http://josm.openstreetmap.de/download/tutorials/josm-introduction.ogg OGG]
 
-=== Raw GPS Points and Photos ===
+
+== Raw GPS Points and Photos ==
 
 Introduction into what those Raw GPS Tracklogs are for and how to load them from a file. The video also shows how to use the feature of importing Photos taken during your trip.
@@ -46 +47 @@
 [http://josm.openstreetmap.de/download/tutorials/josm-rawgpstracks.avi AVI]
 [http://josm.openstreetmap.de/download/tutorials/josm-rawgpstracks.ogg OGG]
+
+
+== Resolving Conflicts ==
+
+This demo explains what conflicts are, when they can occur and how to solve them.
+
+[[Image(josm-resolving-conflicts.jpg)]]
+
+mirrors:
+[http://www.larted.org.uk/mirrors/josm/tutorials/josm-resolving-conflicts.avi AVI]
+[http://www.ostertag.name/osm/josm/tutorials/josm-resolving-conflicts.avi AVI]
+[http://mirror.openstreetmap.nl/josm/tutorials/josm-resolving-conflicts.avi AVI]
+[http://www.larted.org.uk/mirrors/josm/tutorials/josm-resolving-conflicts.ogg OGG]
+[http://www.ostertag.name/osm/josm/tutorials/josm-resolving-conflicts.ogg OGG]
+[http://mirror.openstreetmap.nl/josm/tutorials/josm-resolving-conflicts.ogg OGG]
+
+main:
+[http://josm.openstreetmap.de/download/tutorials/josm-resolving-conflicts.avi AVI]
+[http://josm.openstreetmap.de/download/tutorials/josm-resolving-conflicts.ogg OGG]