[jsword-devel] JSword 2.0 tagged

[Matěj Cepl]

On 07/16/2013 10:30 PM, DM Smith wrote:
> I'm a bit new to git, so I'd like recommendation on how to proceed.
> Do we want to make a v2.0 release branch and have master be the
> development toward the next release? Or do we want to do new
> development on feature branches and have master be the bug fix
> branch?

Both ... whenever there is any question related to git, the answer 
should start with "First make a new branch" :)

Meaning, you should have maintenance versions branches (v2.0, etc.) and 
feature branches ... development should happen only on the latter ones, 
and when the change is fully tested, profiled, approved, reviewed etc., 
it should be merged to something closer to master.

There are numerous workflows used with git, for some of these see:

  - gitworkflows(7) man page
  - http://nvie.com/posts/a-successful-git-branching-model/ ... 
super-complicated, but quite influential
  - http://scottchacon.com/2011/08/31/github-flow.html as an opposition 
to the previous one
  - https://www.atlassian.com/git/workflows#!workflow-gitflow

Best,

Matěj

-- 
http://www.ceplovi.cz/matej/, Jabber: mcepl at ceplovi.cz
GPG Finger: 89EF 4BC6 288A BF43 1BAB  25C3 E09F EF25 D964 84AC

Only two of my personalities are schizophrenic, but one of them
is paranoid and the other one is out to get him.