Bug: Pulling github 'master' branch creates a merge conflict
Reported by dleffler | October 3rd, 2012 @ 07:49 PM | in 2.3.7 (closed)
For some reason when you pull from the master branch of github to update a 2.0.8patch2 site, you'll get a merge conflict and be required to edit exponent_version.php (to remove the merge flags and keep the 2nd version of the offending line and ALSO set the type to nothing vs patch and the iteration to nothing vs 2). and framework/modules-1/calendarmodule/class.php to remove the merge flags and keep the 2nd version of the offending line.
Comments and changes to this ticket
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Bug Tracker for Exponent CMS
expNinja