search

SimonEnsemble / PorousMaterials.jl

Julia package towards classical molecular modeling of nanoporous materials
GNU General Public License v3.0
51 stars 11 forks source link

Eos 2 #70

Closed silsbyc96 closed 6 years ago

silsbyc96 commented 6 years ago

Each test ran separately and passed. Must wait to confirm build is successful

SimonEnsemble commented 6 years ago

@ahyork do you know how we can only see the commits that differ from master when pull requests are made? Is it git rebase master?

ahyork commented 6 years ago

git rebase master is basically a cleaner way of doing a merge. It takes the current state of master then stacks all of the commits from the branch on top of it. It would still show all of the commits, but the changes would be based off the current state of master I believe.

ahyork commented 6 years ago

Before we merge this we should get rid of all the .DS_Store files. I have issues with them and .AppleDouble files because they aren't readable and cause errors when they are in folders with my data.

Do we want all of the *.jld2 files in this repo? we might want to remove them as well.

SimonEnsemble commented 6 years ago

@ahyork agreed, plz don't merge this until we can see the commits and how they differ from master. @silsbyc96 can you git rebase master? git add * is dangerous as it adds all files to the github repo, of which many probably don't belong in the repo. you can remove e.g. jld files via git rm -f *.jld

SimonEnsemble commented 6 years ago

pull request is stale.

looks like git rebase master would have better than git merge master since there are too many changes listed here to review.

see here.