+- Kodi Community Forum (https://forum.kodi.tv)
+-- Forum: Support (https://forum.kodi.tv/forumdisplay.php?fid=33)
+--- Forum: General Support (https://forum.kodi.tv/forumdisplay.php?fid=111)
+---- Forum: Linux (https://forum.kodi.tv/forumdisplay.php?fid=52)
+---- Thread: svn up conflict? (/showthread.php?tid=54480)
svn up conflict? - ronie - 2009-07-12
while updating from r21500 to r21597 i got this warning:
Code:
U xbmc/cores/DummyVideoPlayer.cpp
U xbmc/cores/VideoRenderers/RenderManager.cpp
U xbmc/cores/VideoRenderers/XBoxRenderer.h
U xbmc/cores/VideoRenderers/RenderManager.h
U xbmc/cores/VideoRenderers/WinRenderer.cpp
U xbmc/cores/VideoRenderers/LinuxRenderer.cpp
U xbmc/cores/VideoRenderers/WinRenderManager.cpp
U xbmc/cores/VideoRenderers/WinRenderer.h
U xbmc/cores/VideoRenderers/WinRenderManager.h
U xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
U xbmc/cores/dvdplayer/Codecs/Makefile.in
U xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
Conflict discovered in 'xbmc/cores/dvdplayer/Codecs/libmad/configure'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: s
(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file
(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)
(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)
(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this listi'm no svn guru, so could some kind soul tell me what option to pick ?
- nul7 - 2009-07-12
If you haven't manually changed the file then always use tf (theirs-full).
- ronie - 2009-07-12
thanx!
(nope, i didn't edit the file in any way.)