common-workflow-language / user_guide

The CWL v1.0 - v1.2 user guide
http://www.commonwl.org/user_guide/
Other
42 stars 67 forks source link

Update basic-concepts.md #322

Closed khaiyra closed 2 years ago

khaiyra commented 2 years ago

matched the sequence of the types of processes listed.

swzCuroverse commented 2 years ago

@tetron this is set to go.

tetron commented 2 years ago

There's a merge conflict

khaiyra commented 2 years ago

I guess because my branch wasn't up-to-date when I pulled a request. Let me try that again.

kinow commented 2 years ago

@khaiyra it would be better to start using the same pull request. This way the reviews are kept in a single place, and it's easier for reviewers as they won't mistaken the other PR for a duplicate task (which happens when we have a large group of devs working on the same project :slightly_smiling_face: ). It also gives you an opportunity to learn or practice Git, learning how to rebase and fix conflicts. /cc @swzCuroverse

khaiyra commented 2 years ago

ooh my bad, now I've learnt this and would put into practice moving forward. Thanks @kinow for pointing that out and sorry for any inconveniences🙂