Hi Jeremy,
> On Jan 4, 2020, at 1:53 PM, Jeremy French <[email protected]> wrote: > > Did you create the v17 Master Branch by: > > 1) Open a copy of the v17 structure and then open the copy in v18 to convert > v17 to v18; and > 2) Commit the conversion to v18 as the v17 Master branch; and > 3) Create a new branch (off Master) as v18. > > The above was done only once. Conceptually, that is the best way to think about it. After the first conversion you have a "master" branch which is the 4D 17 version converted to 18. Initially, the "18" branch is exactly the same. Then I can switch to the 18 branch and work on new features that use new commands and functions added in 4D 18. >> >> When I want to commit a new version I have a 4D method that copies the >> structure, opens it in 4D 18, and then exports the structure in project mode >> format. > > Are you doing this workflow to continue development in v17? Yes. Switch back to the 17 "master" branch. Verify there are no uncommitted changes in the Project folder (git status called from 4D). Move the Project folder to the trash. Run the 17 to 18 script again and generate a new Project folder with the current source. Commit as the new "master" branch. Merge (or fast forward) the master branch into the 18 branch to keep it up to date with the changes in 4D 17. In this model, I'm only making structure and form changes in the 17 master branch. Methods can be changed in both branches. John DeSoi, Ph.D. ********************************************************************** 4D Internet Users Group (4D iNUG) Archive: http://lists.4d.com/archives.html Options: https://lists.4d.com/mailman/options/4d_tech Unsub: mailto:[email protected] **********************************************************************
