Known issues that may impact Yalesites users are documented below.
04/09/2014
Merging from the upstream Yalesites repository results in merge error
When attempting to merge upstream changes into a fork of the Yalesites repository, an error is received:
error: The following untracked working tree files would be overwritten by merge: sites/all/modules/contrib/date_ical/includes/DateiCalFeedsParser.inc Please move or remove them before you can merge. Aborting
This is due to a case-sensitivity issue between Git and some filesystems, and a file that has been renamed in the date_ical module. To fix this issue, follow the workaround below. You will first remove the file in question, then fetch and merge changes from the upstream repository.
$ rm sites/all/modules/contrib/date_ical/includes/DateIcalFeedsParser.inc
$ git fetch upstream
$ git merge upstream/master -Xtheirs -m"Merge remote-tracking branch 'upstream/master'"