search

MobleyLab / basic_simulation_training

A document for the Living Journal of Computational Molecular Science (LiveCoMS) which describes basic training for molecular simulations (oriented towards molecular dynamics (MD)), providing some training itself and linking out to other helpful information elsewhere. The intent is that this provide information on the prerequisites which will be required for understanding/following many of the other "best practices" documents being prepared.
Creative Commons Attribution 4.0 International
109 stars 19 forks source link

Merge in Samarjeet's updated figure and code #97

Closed davidlmobley closed 6 years ago

davidlmobley commented 6 years ago

Grr, has conflicts because Samarjeet didn't update his TeX first. Off to meetings. @JIMonroe or @justinGilmer do you have a minute to sort it out?

JIMonroe commented 6 years ago

I can work on this.

JIMonroe commented 6 years ago

@samarjeet I just went with the most up to date tex version from master, which means you may have lost edits to the text that you made.

Could you check this and make changes if you want to?

Before you make changes, though, please run

git checkout post_edits
git pull post_edits

When you're done, commit and run git push origin post_edits to add you're commits here.

JIMonroe commented 6 years ago

That is to say, the figure is updated, but the text, including the caption, etc., may not have the edits you want.

davidlmobley commented 6 years ago

Alternatively you can bring in edits to the caption in a separate PR from a separate branch, which is the approach I proposed in the toher thread, @samarjeet . (In which case we should merge this one first.)

davidlmobley commented 6 years ago

@samarjeet were you going to edit the caption, etc.? I want to get this merged and resubmitted.

samarjeet commented 6 years ago

@davidlmobley Edited. Can you please review and merge ?

davidlmobley commented 6 years ago

Thanks!