search

NSLS-II / docs

Standards Documentation for NSLS-II DAQ and Analysis
https://nsls-ii.github.io
BSD 2-Clause "Simplified" License
2 stars 13 forks source link

ENH: adding a warning and correcting a few typo/grammar issue #95

Closed awalter-bnl closed 5 years ago

awalter-bnl commented 5 years ago

This PR is a result of a review of the deployment docs section. It involves adding a warning based on an issue from the last cycle, a few grammar re-arrangments and correction of a few typos. I also updated the name of the local anaconda server to alexandria.

awalter-bnl commented 5 years ago

The force push was done to resolve a git commit issue (2 almost identical commits ended up in the history, I squashed them together and then force pushed the result)

mrakitin commented 5 years ago

Ups, GitHub's "Resolve conflicts" interface produced a merge commit. Will resolve it tomorrow morning.

tacaswell commented 5 years ago

source/deployment/resyncing-conda.rst <- that whole file in now wrong, @licode how do we do it now?

mrakitin commented 5 years ago

Sorry I screwed up the history of the PR after force pushes last night. Now there is a merge-commit 49122949a7001832618495f805a03fa710b1f0fb, which could have been avoided if git pull was used before committing your changes. @danielballan, what's the best way to remove it?

awalter-bnl commented 5 years ago

@mrakitin I did do a git pull prior to sending in the commit this morning, that is what added merge-commit 4912294. I can squash the last two together to resolve that, I will do so now.

awalter-bnl commented 5 years ago

OK so git rebase won't let me squash the merge commit, sorry.

mrakitin commented 5 years ago

No worries, thanks for trying.

licode commented 5 years ago

source/deployment/resyncing-conda.rst file is out of date. I can send pr to work on it. Do I send a new one after this get merged? Or I just push to the current pr? It looks like there were some issue, but just got resolved here.

awalter-bnl commented 5 years ago

@licode please just push to this one, that way we keep everything together.

licode commented 5 years ago

thanks for suggestion!

licode commented 5 years ago

Done.