Tom, Yes, you're correct, currently the move from binary to Project format is one way, whether this will become bi-directional I don't know. It is still possible to compile back to a single binary though so the step to go from Project to interpreted structure binary should surely be possible??
Yes, Branching is a core concept of working with Git. I think what each of your developers need to do is to Checkout a Git repo Feature Branch of Master and export their changes into that. Then, they Push that Feature Branch up to Master and make a Pull request into Master. Once approved then the Feature Branch is merged into Master. Other developers would do the same. Then, each developer Pulls Master to update their local Checked out copy of Master. They can Diff that against their previous Feature Branch which will give them a list of all the changes that the _other_ developers have made and merged into Master and synch their structure up. I think that's it above! The ultimate benefit of all that is that your devs are only ever moving around Diffs, not the whole structure export. Regards, Narinder Chandi, ToolBox Systems Ltd. I am available for new consulting opportunities… http://4d.1045681.n5.nabble.com/ANN-4D-Developer-Available-td5765443.html -- -----Original Message----- From: Tom Benedict <benedic...@comcast.net> Date: Thursday, 10 October 2019 at 21:22 To: 4D Tech Mailing List <4d_tech@lists.4d.com> Cc: Narinder Chandi <4dtechmailingl...@toolbox.uk.com> Subject: Re: Using Github to Manage Distributed Development Thanks for your response Narinder, >ditch the 4D binary based structure file and use v17's 4D Project format Indeed, that is an attractive option, although it requires 17R5 or higher. Once it’s out of beta I may consider it. I’ve heard that once a structure is moved to Project Mode, there’s no way to get it out of Project Mode. I don’t really know what that means, but that’s one of the reasons I haven’t tried it yet. >Some variation of Gitflow has been used at every client I've worked for over the last few years (in a PHP context). I think what you describe below loosely maps to Gitflow so take a look at that and see if this is the case. Briefly, each of your developers creates their own Feature branch from the Master branch on Git, work on it and then merge back into Master (there's a bit more to the process but I'm just trying to simplify). This is great guidance. I wasn’t sure whether each developer would be a separate branch or not. Right now my biggest challenge is logistical. The structure export consists of over 55,000 files. Running that every few days and uploading to Git takes hours. There’s gotta be a more efficient way. I’ll check out Gitflow and see whether it can help me. Thanks again, Tom Benedict > On Oct 10, 2019, at 13:12, Narinder Chandi via 4D_Tech <4d_tech@lists.4d.com> wrote: > > Tom, > > What version of 4D are you using? > > It seems to me that the way forward for team development (or solo for that matter) will be to ditch the 4D binary based structure file and use v17's 4D Project format stored that in a Git repo, even though it's still Beta it should be finalised soon enough. IMO, this is going to be a revolutionary change for managing 4D code and supporting assets. > > The most popular Git branching model is Gitflow: > https://nvie.com/posts/a-successful-git-branching-model/ > > Some variation of Gitflow has been used at every client I've worked for over the last few years (in a PHP context). I think what you describe below loosely maps to Gitflow so take a look at that and see if this is the case. Briefly, each of your developers creates their own Feature branch from the Master branch on Git, work on it and then merge back into Master (there's a bit more to the process but I'm just trying to simplify). > > Regards, > > Narinder Chandi, > ToolBox Systems Ltd. > > I am available for new consulting opportunities… > http://4d.1045681.n5.nabble.com/ANN-4D-Developer-Available-td5765443.html > -- > > -----Original Message----- > From: 4D_Tech <4d_tech-boun...@lists.4d.com> on behalf of 4D Tech Mailing List <4d_tech@lists.4d.com> > Reply-To: 4D Tech Mailing List <4d_tech@lists.4d.com> > Date: Thursday, 10 October 2019 at 18:42 > To: 4D Tech Mailing List <4d_tech@lists.4d.com> > Cc: Tom Benedict <benedic...@comcast.net> > Subject: Using Github to Manage Distributed Development > > In my current environment, each developer works on a separate copy of a “Master" 4D structure. Periodically each developer runs the "Export structure file” command to export everything (methods, forms etc) to local disk. Then they compare those files using a diff tool (Examdiff in our case) against a folder full of files exported from the "master” copy of the 4D structure. The diff tool shows us what methods/forms/etc are different. The developer then uses that list as a guide and, with both the local 4D structure open and the “master” 4D structure open, copy/pastes or ‘moves’ the edits from local to master. > > We would like to move this process to Github. I’ve tried, but have not been able to map the Git concepts to my existing process. Is anyone using Github with 4D in this way? If so, could you describe your workflow? > > BTW, I’ve read the Tech Note about 4D on Github, but it looks like it is focused on using Project Mod. I also read Thomas Maul’s post <https://forums.4d.com/Post/EN/30825681/1/30888856#30825682> about his component which will commit methods to Github. I’m also aware of Lutz Epperlein’s use of VC Framework. None of those matches my current workflow. > > Thanks for any help. > > Tom Benedict > ********************************************************************** > 4D Internet Users Group (4D iNUG) > Archive: http://lists.4d.com/archives.html > Options: https://lists.4d.com/mailman/options/4d_tech > Unsub: mailto:4d_tech-unsubscr...@lists.4d.com > ********************************************************************** > > > ********************************************************************** > 4D Internet Users Group (4D iNUG) > Archive: http://lists.4d.com/archives.html > Options: https://lists.4d.com/mailman/options/4d_tech > Unsub: mailto:4d_tech-unsubscr...@lists.4d.com > ********************************************************************** ********************************************************************** 4D Internet Users Group (4D iNUG) Archive: http://lists.4d.com/archives.html Options: https://lists.4d.com/mailman/options/4d_tech Unsub: mailto:4d_tech-unsubscr...@lists.4d.com **********************************************************************
