After spending considerable time trying to work out how to manage keeping AngbandBase up to date, and how to make it an integral part of Vanilla, it turns out there is a simple solution. I simply had to make a branch of the official V repository called AngbandBase. Now keeping it up to date is as simple as 'git merge official/master', unless names change or new files come in.
And I suspect (but haven't checked) that incorporating it into a variant is about as easy - make the V repository a remote, and then merge the AngbandBase branch into the variant's master. All with the magic of git.
PS Well, not quite as magic as I'd hoped. Every Vanilla file deleted in AngbandBase causes a conflict in the merge; they then have to be forcibly removed and everyone's happy again. Is there a simpler way to do that?
No comments:
Post a Comment