search

WardCunningham / Smallest-Federated-Wiki

This wiki innovates by: 1. federated sharing, 2. drag refactoring and 3. data visualization.
http://wardcunningham.github.com/
GNU General Public License v2.0
1.21k stars 178 forks source link

client js files missing #359

Closed paul90 closed 11 years ago

paul90 commented 11 years ago

The recent bundle of updates causes a problem, manifested by no content getting displayed. Capture

Those 404s show in the log as:

"GET /js/jquery-ui-1.10.1.custom.min.js HTTP/1.1" 404 213 0.0000 "GET /js/jquery-ui-1.10.1.custom.min.css HTTP/1.1" 404 213 0.0000

Looking behind the scenes the client/js directory that the server is looking in for those files is included in the .gitignore file - so any changes to add the newer version (and probably remove the old) have not been captured by git.

Grabbing those two files, from jQuery UI seems to resolve the problem. Not sure what else, if anything, is missing.

WardCunningham commented 11 years ago

Uh oh. This is a case of me knowing too much git for my own good. I forced those files into the repo with the -f option on git-add. Oh, but it was late and I wanted to amend the previous commit so I undid the adds, did the amend, and then forgot to force the new files in again. Might be time for some more simplification.

paul90 commented 11 years ago

Not sure what happened with the pull request, there should having only been the one commit, and not all those old ones repeated.

Looking at it this morning, it seems as if the pointers where different between github and my local - Git for Windows said they were sync'ed, but they very probably were not... (the references for upstream master (your GitHub) and origin master (my GitHub fork) were pointing to different places although they should have been the same - the origin master was getting left behind somehow). Using the command line to push the changes to GitHub seems to sort things out. Goodness knows how that happened :(

Guess I will have to use the command line and stop using Git for Windows...

WardCunningham commented 11 years ago

Its hard to say what GitHub thought happened. The git log looks clean enough and gitx which I use looks as clean as to be expected. We have tried the rebasing methodology which can make for super clean history but also removes many safety features of git. We learn together.

paul90 commented 11 years ago

All about learning, and those we share the journey with.

Closing the issue as it is now resolved.