Evolution: which Git repository for development (and branching model)?

- MODX Staff
- 10,725 Posts
opengeek Reply #11, 13 years, 5 months ago

Now it is done...master and develop match HEAD currently. IMPORTANT: the develop branch was force updated, so you will need to delete your local develop branch or use the --force switch when pulling/merging from upstream.
Jason Coward
Chief Architect @ MODX
http://www.jasoncoward.com | http://twitter.com/drumshaman | https://github.com/opengeek