Maucio has been hard at work documenting. I ran into the following error when updating:
> From github.com:uDig/udig-platform > f924edf..131783b master -> upstream/master > Updating f924edf..131783b > error: The following untracked working tree files would be overwritten by > merge: > plugins/net.refractions.udig.help/EN/_images/editmenu.png > plugins/net.refractions.udig.help/EN/_images/legend.png > Please move or remove them before you can merge. > Aborting > > This problem (I think) only occurs on computers that are running a case insensitive file system. Git was unable to figure out the difference between: editmenu.png and EditMenu.png After a lot of searching I found this: http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull The result is: git fetch --all git reset --hard origin/master -- Jody Garnett
_______________________________________________ User-friendly Desktop Internet GIS (uDig) http://udig.refractions.net http://lists.refractions.net/mailman/listinfo/udig-devel
