Skip to content
This repository has been archived by the owner on Jan 22, 2019. It is now read-only.

Revert "CodeSynthesis XSD library (take 2)" #35

Merged
merged 1 commit into from
Mar 4, 2015

Conversation

nickerso
Copy link
Contributor

@nickerso nickerso commented Mar 4, 2015

Reverts cellml/libcellml#33 since that should have been to the develop branch rather than master.

nickerso added a commit that referenced this pull request Mar 4, 2015
Revert "CodeSynthesis XSD library (take 2)"
@nickerso nickerso merged commit a47aee3 into master Mar 4, 2015
@nickerso nickerso deleted the revert-33-code-synthesis-xsd-lib02 branch March 4, 2015 00:43
@mirams
Copy link
Contributor

mirams commented Mar 4, 2015

Oops, sorry, bit confused why the develop is behind master?

@nickerso
Copy link
Contributor Author

nickerso commented Mar 4, 2015

Again, it will be clear once the development process document is written - but the idea is something like all the work is done on develop and master (or maybe a release branch) will be updated when releases are made. So until the first release master will be effectively empty.

The problem here was that Randall (@codecurve) submitted the pull request to the wrong brunch and then I missed that in the "review". Executing the merge once the review is all done was the correct thing to do :)

@nickerso nickerso mentioned this pull request Mar 4, 2015
@codecurve
Copy link
Contributor

It might be worth trying setting "develop" as the default branch, maybe that would mean that pulls default to that target. However, that means that rendered markup etc. would be the content on that branch too.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants