[Tux4kids-tuxtype-dev] [Tuxmath-devel] t4k_common problem in tuxtype and tuxmath

[David Bruce]

Hi,

I got a different error when trying to pull from git:

dbruce at debian-laptop:/usr/local/src/git/t4kcommon$ git pull
Password:
Updating 03000a0..860950b
error: Untracked working tree file
'cmake-modules/ConfigureChecksIntl.cmake' would be overwritten by
merge.  Aborting

By deleting that file locally, I was then able to pull.  So is this a
generated file?  If so, we shouldn't be tracking it in git.

Anyway, after that, the build and install itself didn't have any problems.

David