Hello all,
In the past I had the following strategy to maintain our customized ILIAS with SVN:
- Each year I copied an ILIAS release branch and applied all my local changes to it.
- During the year I continuously merged ILIAS fixes from the release branch and commited further own adaptations.
For a new ILIAS main release I had to do the same again. In SVN this was fairly easy, because I could do a simple 3-way merge to get the differences between my old branch and the last merged revision of ILIAS and apply them to the working copy of my new clean ILIAS branch, e.g.:
svn merge
http://svn.ilias.de/svn/ilias/branches/Release_4_4_x_branch@57944
http://svn.ilias.de/svn/ilias/branches/fau/studon_4_4_x
Of course this brought me some conflicts that had to be solved but it worked astonishingly good and I got a solid basis for further bugfix updates. A clean, linear ILIAS history is more importent to me than keeping the history of my adaptations.
Now, how will this procedure work with Git?
Trying to do a merge brings me a lot of conflicts for changes between the old and new ILIAS main release that are not related to my own changes. Rebasing seems not to be an option, because the commits in the trunk differ from the bugfixing commits in the old feature branch.
Is there something similar to a 'history blind' 3-way merge in Git or would you recommend a complete different strategy?
Thanks for any suggestion.
Fred