Thanks, Ray. That's what I wound up doing too. I wish there was a better solution.
On Monday, April 4, 2022 at 9:30:38 AM UTC-7 Ray Bon wrote: > Dustin, > > With the initializer creation of cas overlay there is no change history, > as you note. > I clone the overlay project in a temp directory and do a normal diff with > my overlay project and copy over changes. > > > Ray > > On Fri, 2022-04-01 at 15:31 -0700, Dustin Luck wrote: > > Notice: This message was sent from outside the University of Victoria > email system. Please be cautious with links and sensitive information. > > > I'm wondering if anyone has a solution for this issue. > > To start our update to CAS 6.5, we cloned the cas-overlay-template > repository from github, then made our modifications, checking them in to > our own repository as we went along. Now that there is a new version, I > thought the right thing to do would be to pull the latest from the 6.5 > branch. However, doing so results in one of two things: > > - *without rebase*: an error that says, "fatal: refusing to merge > unrelated histories" > - *with rebase*: many, many conflicts that have to be manually resolved > > I wound up doing a fresh clone to a temp directory and using WinMerge to > apply the diffs and then commit. My guess is that git can't do a good job > of merging the changes from 6.5.0 to 6.5.2 because the cas-overlay-template > repository doesn't keep the commit history. > > Appreciate any help or hints > Thanks > > -- > > Ray Bon > Programmer Analyst > Development Services, University Systems > 2507218831 <(250)%20721-8831> | CLE 019 | [email protected] > > I acknowledge and respect the lək̓ʷəŋən peoples on whose traditional > territory the university stands, and the Songhees, Esquimalt and WSÁNEĆ > peoples whose historical relationships with the land continue to this day. > -- - Website: https://apereo.github.io/cas - Gitter Chatroom: https://gitter.im/apereo/cas - List Guidelines: https://goo.gl/1VRrw7 - Contributions: https://goo.gl/mh7qDG --- You received this message because you are subscribed to the Google Groups "CAS Community" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/a/apereo.org/d/msgid/cas-user/e4f66a6b-88dd-470c-8196-000b4ef918afn%40apereo.org.
