Re: migrated to git

[Josh Thompson <jo...@ncsu.edu>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I just created the develop branch.  Any commits need to be made against it.  
Then, when it comes time to get a release out, we'll create a release branch 
that will eventually get merged into master and tagged as a release.  That and 
critical bug fixes that cause a new release to be done are the only times 
something should be merged into master from here forward.

Josh

On Thursday, October 19, 2017 2:10:03 PM EST you wrote:
> In a thread back in 2015, titled "migrate to git" (http://markmail.org/
> message/mn2fgcnsdgjkckhl), we decided on migrating from subversion to git.
> 
> After 2+ years, we've finally migrated!
> 
> https://git-wip-us.apache.org/repos/asf/vcl.git
> 
> It's also mirrored to GitHub:
> 
> https://github.com/apache/vcl
> 
> The thread mentioned above discussed Git workflows, most people seemed to
> like the Git Workflow.  Here is a relavent section I wrote in one of the
> emails in the thread to apply that to our development:
> 
> ====================================================
> For git, I think we should follow the Gitflow Workflow.  This would involve
> maintaining a development branch on which developers would create branches
> for any development work, with the branches having a name related to the
> feature and an associated JIRA issue - something like
> VCL123-some_new_feature.  Once development is complete in the branch, the
> developer either goes ahead and merges it into the main development branch,
> or if the developer wants feedback first, a pull request can be done before
> merging it in.  Then, the developer would merge the branch in after
> handling any suggestions/edits from others.
> 
> At release time, we create a release branch, and tag it each time an RC is
> released.  Any bugs found are fixed in the release branch and also merged
> into the main development branch.  Once a vote is successful, the release
> branch is merged into the master branch, a tag is created, and the release
> artifact is generated from that.  (I do have a question here - the master
> branch after the merge would have to exactly match the release branch,
> otherwise we wouldn't be releasing exactly what was voted on.  So, that may
> need some more research.)
> ====================================================
> 
> Based on this, we'd need to create a development branch to get started. 
> Then, as we work on JIRA issues, we create branches off of that, then merge
> back to the development branch once the work for the JIRA issue is done.
> 
> How does this sound?
> 
> Josh
> --
> -------------------------------
> Josh Thompson
> VCL Developer
> North Carolina State University
> 
> my GPG/PGP key can be found at pgp.mit.edu
> 
> All electronic mail messages in connection with State business which
> are sent to or received by this account are subject to the NC Public
> Records Law and may be disclosed to third parties.
- -- 
- -------------------------------
Josh Thompson
VCL Developer
North Carolina State University

my GPG/PGP key can be found at pgp.mit.edu

All electronic mail messages in connection with State business which
are sent to or received by this account are subject to the NC Public
Records Law and may be disclosed to third parties.
-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQRMIdRtWXideTZDK31X8tBw1209AwUCWhxt3AAKCRBX8tBw1209
A6GdAJ0ZxvbZDu4FtOSa96UbjxlfKzJ4HQCfUvEshE9WoNlkJZwr0e4Gxea8fpw=
=OnvC
-----END PGP SIGNATURE-----