mlinksva
commented
9 years ago Probably useful to check each file in master, merging (or not) and deleting from master. When master is empty, issue is done.
That was an extraordinarily stupid idea. I just merged master into gh-pages, without conflict.
2.1 draft is now visible on the site at
http://opendefinition.org/source/open-definition-2.1-dev
No changes should be made to master from now on. cc @hlainchb
Anything useful in master only should be merged into gh-pages and visible on website, as discussed on OD call today.
Probably useful to check each file in master, merging (or not) and deleting from master. When master is empty, issue is done.