search

dataspread / dataspread-web

http://dataspread.github.io
135 stars 31 forks source link

Repo cleaning #203

Closed shichuzhu closed 6 years ago

shichuzhu commented 6 years ago

Update .gitignore files and implement the deletion of redundant files according to reference

Note: Once this is merged into master, the next time any collaborator doing a git pull will delete the local copies of their listing files if existing. However, this deletion can be restored afterwards following this post. All these deleted files are autogenerated by IntelliJ anyway.

shichuzhu commented 6 years ago

I've tested the updated branch and both mvn build & IntelliJ works with the listing files deleted. Specifically, I clone the updated branch only to a brand new local directory git clone git@github.com:dataspread/dataspread-web.git --single-branch --branch=repo_cleaning , and then mvn build it & open it using IntelliJ (Enable mvn auto-import within, and then create the tomcat config).

shichuzhu commented 6 years ago

NOTE: If after git pull of this patch anyone finds his/her .idea/ config files are lost, they can be restored by the following commands: (Inspired by the referred post mentioned above

  1. Save any unstaged work by git stash
  2. git checkout 7070a72^ # get to the state before this deletion commit. The deleted files should now appear again.
  3. git reset 7070a72 # reset the indexing to after applying the patch
  4. git reset --hard 7070a72 # Reapply the patch without deleting the now 'untracked' files
  5. git checkout master # Go back to where I were after step 1.
  6. git stash pop # Reapply the unstaged work, undoing step 1.