search

tskit-dev / tutorials

A set of tutorials for msprime and tskit.
Creative Commons Attribution 4.0 International
19 stars 15 forks source link

Suggested edits #279

Closed gregorgorjanc closed 2 months ago

gregorgorjanc commented 2 months ago

Passed terminology_and_concepts.md and thought these edits might be useful.

My plan is to go over some/most of the tuts. Should I suggest edits one at a time or in a batch?

benjeffery commented 2 months ago

LGTM - needs a sqash and rebase before merge as the commit list has a merge commit in.

gregorgorjanc commented 2 months ago

@benjeffery I always struggle with squash and rebase - where can I get a dummy do this after you have opened PR help on doing this? THANKS!

benjeffery commented 2 months ago

@benjeffery I always struggle with squash and rebase - where can I get a dummy do this after you have opened PR help on doing this? THANKS!

The workflow docs are here: https://tskit.dev/tskit/docs/stable/development.html#git-workflow

I can fix up this PR if you like?

petrelharp commented 2 months ago

Also for "when rebasing goes wrong" see: https://popsim-consortium.github.io/stdpopsim-docs/stable/development.html#when-rebasing-goes-wrong