These are chat archives for SmingHub/Sming

Mar 2017
Mar 28 2017 12:30
When trying to switch branch, git complains about third-party files being overwritten: git checkout 3.1.2 error: The following untracked working tree files would be overwritten by checkout: Sming/third-party/axtls-8266/.gitignore Sming/third-party/axtls-8266/.gitmodules Sming/third-party/axtls-8266/.travis.yml ...
Mar 28 2017 14:26
If you don't have local changes in third-party then you can try this:
rm -rf third-party
git checkout third-party
git checkout amazing/new/feature
Mar 28 2017 15:22
Thanks @slaff - got that. Maybe it should be a bit easier. Something is happening during the build that makes switching branches awkward. It would be nice to be able to switch branches more easily. I think my productivity (contribution) may increase if I wasn't continually fighting with git!