search

edwardvmills / Silk

NURBS Surface modeling tools focused on low degree and seam continuity (FreeCAD Workbench)
https://edwardvmills.github.io/Silk/
62 stars 11 forks source link

Why is there a submodule of Silk within Silk? #12

Closed luzpaz closed 5 years ago

luzpaz commented 5 years ago

image

edwardvmills commented 5 years ago

it's empty. probably created by accident in this location, or moved by accident. will remove

luzpaz commented 5 years ago

Thanks, yea, i was getting errors when trying to run a git pull

edwardvmills commented 5 years ago

did the error prevent you from pulling?

edwardvmills commented 5 years ago

crap. got a new computer, pulled and didn't do much for a while. now it's doing something weird with my .gitignore

windows wasn't displaying the .gitgnore file name correctly. tried editing it, and then git said i had added a new file '.gitignore.gitignore' deleted and recreated .gitignore, but git doe not ignore and tries to pull all the .pyc into the queue.

gonna take me a bit to sort this out

edwardvmills commented 5 years ago

yeah, have an OS problem here with .files

`

Untracked files: (use "git add ..." to include in what will be committed) .gitignore.txt ArachNURBS.pyc ControlGrid44.pyc ControlGrid44_2EdgeSegments.pyc ControlGrid44_EdgeSegment.pyc ControlGrid64.pyc ControlGrid64_2Grid44.pyc ControlGrid64_3_1Grid44.pyc ControlGrid66.pyc ControlGrid66_4Sub.pyc ControlGridNStar66.pyc ControlPoly4.pyc ControlPoly4_segment.pyc ControlPoly6.pyc CubicCurve_4.pyc CubicCurve_6.pyc CubicNStarSurface_NStar66.pyc CubicSurface_44.pyc CubicSurface_64.pyc CubicSurface_66.pyc Point_onCurve.pyc Silk_dummy.pyc StarTrim_CubicNStar.pyc SubGrid33_2Grid64.pyc SubGrid63_2Surf64.pyc pycache/ no changes added to commit (use "git add" and/or "git commit -a") Edward Mills@DESKTOP-7C746LP MINGW64 ~/AppData/Roaming/FreeCAD/Mod/Silk (master) $ git add .gitignore Edward Mills@DESKTOP-7C746LP MINGW64 ~/AppData/Roaming/FreeCAD/Mod/Silk (master) $ git add .gitignore fatal: pathspec '.gitignore' did not match any files

` git sees gitignore and puts it in untracked files, but if i try to add it, then it can't find it. i'm pretty stumped

edwardvmills commented 5 years ago

ok, now i see it. windows is doing weird shit with file extensions.

edwardvmills commented 5 years ago

ok, things are looking ok from my end. empty Silk folder removed.