I did, in one of our other threads, invite you to post here if you wanted to continue the substantive discussion. But it seems to me like you've just ignored my previous points, and also presented a misleading factual summary.I think the history winds up slightly cleaner if we make a branch from master and merge this into that branch. Plus we agreed on a general policy of not merging master into branches and I don't see much reason here to make an exception.
And so, as I posted in our development discussion, I've already made a new experimental research branch in my repo, from current master with the older research_ai branch merged into it, so that we can continue the WIP research development there. By my testing, this is fully compatible with the current executables. Am I missing something, is there any way that this is incompatible or otherwise unsatisfactory for your purposes?Cjkjvfnby wrote:Both branchws are not compatiable with curent test build.
(For anyone else wanting to be involved in the discussion, the source of the incompatibility was some FOCS syntax changes made in unrelated content, so current executables won't run with the content in the older branch, but there were no conflicts or other trouble merging that older branch into a new branch off of current master, to serve as our new locus for continuing this work; it seems to me to work out fine.)
Well, as I have previously noted, it seems to me the new branch already meets your current needs. If you disagree, perhaps you could explain why?What I want:
Master merged to Dilvish often (onece a week when new test build comes or when related changed in master done).
I want to fork this branch and merge my changes to it often too.
What you suggest me to do?
If there winds up being another FOCS syntax change that makes this new branch incompatible with the then-current executables, then I can repeat this process at that time. I'm not understanding any reason for it to be done once a week.Master merged to Dilvish often (onece a week when new test build comes or when related changed in master done).