search

RuleML / issues-ruleml

A repository solely for RuleML issues. No schemas or documents should be committed here.
3 stars 3 forks source link

deliberation-ruleml branching #3

Closed greenTara closed 9 years ago

greenTara commented 11 years ago

The deliberation-ruleml repo and the live /1.0 directory have diverged during the move to Hawkhost. There were some experimental commits in the repo since the last release that did not get migrated to the live website. Then there were some emergency changes made to the live website to get it functional after the move.

greenTara commented 11 years ago

I propose that we

  1. create a branch called "live" that is created from the point in deliberation-ruleml history that is the most appropriate ancestor for the current state of the website.
  2. cherry pick the commits from "master" that have been migrated to the website
  3. incrementally add the changes made after the move
  4. evaluate whether any additional commits from "master" should be merged into "live"
  5. work from "live" for the development of 1.0.1
greenTara commented 11 years ago

I have created the "live" branch and have synchronized the parts of it that were already under version control in "master". There is still a lot of content in "live" that is not part of "master",

greenTara commented 9 years ago

Solution: maintain the live branch for archiving, and manually extract material if needed.