[Cialug] Git Workflow Suggestion

[Dave Hala]

We use strategy very similar to what Scott describes.

On Wed, Apr 28, 2021 at 10:33 PM Scott Yates <Scott at yatesframe.com> wrote:

> The way you describe it, I would probably set up a Continuous Integration
> so that it would build from master, then package up the resulting artifacts
> (executables, supporting files, etc) and have them pull from that.  That
> way you can control what versions they are testing, and there is no
> question about them mis-deploying things or being out of date somewhere.
>
> Our git strategy is that master is always currently what is deployed to
> production, and branches are where we do our work.  After review and
> acceptance, the branch gets merged back into master prior to deployment.
>
>
>
> On Tue, Apr 27, 2021 at 8:33 AM Todd Walton <tdwalton at gmail.com> wrote:
>
> > For all you experienced git wizards out there, I would like a suggestion,
> > please.........
> >
> > The QA team at work will be handed a branch of a repository and told to
> > test it. So they do. They go back and forth with the developers and it
> > takes a while, sometimes weeks. While they're doing this other changes
> may
> > have been merged into master. So now whatever feature they're testing in
> > their own branch drifts away from what's in master. What they're testing
> is
> > no longer what will *actually* be running in production. The local
> feature
> > may have some interaction with subsequent changes to master and they
> > wouldn't know it. How can they keep their branch up-to-date?
> >
> > I'm supposing they'd need to periodically rebase their branch, if that's
> > the right term. It'd be nice if that could be automated. We use GitLab,
> but
> > that doesn't (as far as I know) have such a feature.
> >
> > --
> > Todd
> > _______________________________________________
> > Cialug mailing list
> > Cialug at cialug.org
> > https://www.cialug.org/cgi-bin/mailman/listinfo/cialug
> >
> _______________________________________________
> Cialug mailing list
> Cialug at cialug.org
> https://www.cialug.org/cgi-bin/mailman/listinfo/cialug
>


-- 
NIFCAP  -The Premier Client Intake System for Non-Profit Organizations.
https://www.osis.us