search

MaslowCNC / Mechanics

Digital Design Files
Other
232 stars 70 forks source link

Replacing invalid files #61

Closed mrfugu closed 7 years ago

mrfugu commented 7 years ago

I'm not sure why these appear as 'invalid' in the current version. The File size is significantly different from my local copies, so I'm reposting them via this pull req.

BarbourSmith commented 7 years ago

That is strange! Good catch.

This pull request is showing 'conflicts' with the master version. Usually this means that two people have edited the files in question at the same time, but I don't think anyone else has touched these files recently so it might be an issue with when this version was made vs when the previous version was made.

I would try clicking the "sync" button in the upper right of GitHub desktop and the "Update from master" button in the upper left if it is showing up

mrfugu commented 7 years ago

I think I fixed everything. Still not sure what happened but each file looks like it was appended to the previous version, instead of replacing the previous version.

BarbourSmith commented 7 years ago

Looks perfect

mrfugu commented 7 years ago

thanks! and continued apologies for having to shepherd along my github learning curve.

good luck with the shipments upcoming!