Parallel working branches

oasis-tcs / openc2-oc2ls

OASIS OpenC2 TC: GitHub repository used to propose and track changes to the OpenC2 Language Specification as new working draft level revisions are created and the associated CSDs mature

https://github.com/oasis-tcs/openc2-oc2ls

Other

15 stars 19 forks source link

Parallel working branches #420

Closed davaya closed 9 months ago

davaya commented 9 months ago

There are two working branches: "working" (Sept 28,2023, 167 ahead, 9 behind published) and "working-cs02" (Dec 14, 2022, 166 ahead, 9 behind) that are mostly but not entirely in sync.

This would make sense if we were working in parallel on continued updates to LS v1 and breaking changes to LS v2, bit it's not clear that that is the purpose. If the next published version will be CS02 with breaking changes, then we should harmonize the working branches to a single branch with commits from both.

davaya commented 9 months ago

git log shows only one difference: merge and update README in working vs. "Update oc2ls.md" in working-cs02.

dlemire60 commented 9 months ago

Agree about harmonizing. Next version will be v2.0 CS01.