Bug: Pulling github 'master' branch creates a merge conflict
Reported by dleffler | October 3rd, 2012 @ 07:49 PM
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
-
dleffler November 21st, 2012 @ 08:56 PM
- Milestone changed from “2.1.0” to “2.1.1”
- Milestone order changed from “24” to “0”
-
dleffler November 24th, 2012 @ 07:50 PM
Still exists w/ 2.1.0, exponent_version.php still seems to be the problem
-
-
-
dleffler February 16th, 2013 @ 02:55 AM
- Milestone changed from “2.2.0alpha2” to “2.2.0alpha3”
-
dleffler March 2nd, 2013 @ 09:45 PM
- Milestone changed from “2.2.0alpha3” to “2.2.0beta1”
-
dleffler March 16th, 2013 @ 03:27 AM
- Milestone changed from “2.2.0beta1” to “2.2.0beta2”
-
dleffler March 29th, 2013 @ 07:59 PM
- Milestone changed from “2.2.0beta2” to “2.2.0beta3”
-
dleffler April 20th, 2013 @ 10:17 AM
- Milestone changed from “2.2.0beta3” to “2.2.0release-candidate”
-
dleffler May 1st, 2013 @ 10:22 AM
- Milestone changed from “2.2.0release-candidate” to “2.2.1”
-
-
dleffler June 1st, 2013 @ 08:02 PM
The easiest fix (you do have a backup and have exported your files, right?) to this is to do a:
git fetch --all git reset --hard origin/master -
dleffler March 24th, 2014 @ 02:37 PM
- State changed from “new” to “knownissue”
-
-
-
-
Please Sign in or create a free account to add a new ticket.
With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.
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
dleffler
expNinja