Just delete the mentioned files RegularScreen.png (32x32 and 48x38) on
your local file system and then run a hg update.
On 17.08.17 20:16, Helmut Schmidt wrote:
I get the same error message (HG workbench on Win7)
Am 17.08.2017 um 19:45 schrieb Wolfgang Thämelt:
Hi,
when trying to get the latest commits to my local repository the
following error message appears:
% hg update --config ui.merge=internal:merge --rev default --clean
abgebrochen: Groß-/Kleinschreibungskonflikt zwischen
src/icons/32x32/Regularscreen.png und src/icons/32x32/RegularScreen.png
[command returned code 255 Thu Aug 17 19:39:09 2017]
Any advice how to handle this conflict with TortoiseHg or hg?
Windows10 version.
Thanks
WolfgangTh
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Qlandkartegt-users mailing list
Qlandkartegt-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Qlandkartegt-users mailing list
Qlandkartegt-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Qlandkartegt-users mailing list
Qlandkartegt-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
