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 -- - 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/c643d333-95fc-462e-8871-b0c1dfe69bc4n%40apereo.org.
