Git workflow

Discussions and requests related to new CMSimple features, plugins, templates etc. and how to develop.
Please don't ask for support at this forums!
cmb
Posts: 9957
Joined: Tue Jun 21, 2011 11:04 am
Location: Mü-Sa
Contact:

Git workflow

Postby cmb » Sun Dec 18, 2016 5:53 pm

Hi!

Sometime we had decided on a branching strategy. Basically, I'm still happy with it, but I want to suggest a small change: instead of merging from trunk/master to release branches if necessary, we should better commit to the lowest branch which needs a change and then merge upwards (it's usually best if the developer solving an issue does the merge as they can resolve merge conflicts right away). This has the big benefit, that necessary merges can't be easily forgotten. Furthermore, doing it this way results in a cleaner Git history.

Consider what this workflow would look currenly (active branches are 1.6 and master) like for a bug fix:

Code: Select all

$ cd local-git-repo
$ git checkout 1.6
. . . edit file(s) . . .
$ git commit
$ git checkout master
$ git merge 1.6
$ git push --all


If the merge would be forgotten, the next developer fixing another bug would notice that the final merge won't be as expected, and could cater to it (for instance, by notifying the other dev about the issue).

Note that this is basically the PHP Git workflow.

(Not part of this proposal, but not completely unrelated: How to Write a Git Commit Message.)
Christoph M. Becker –Plugins for CMSimple_XH, but not for CMSimple 4+

cmb
Posts: 9957
Joined: Tue Jun 21, 2011 11:04 am
Location: Mü-Sa
Contact:

Re: Git workflow

Postby cmb » Sun Dec 18, 2016 6:15 pm

I've opened the voting on this issue which ends on 2017-01-01.
Christoph M. Becker –Plugins for CMSimple_XH, but not for CMSimple 4+

cmb
Posts: 9957
Joined: Tue Jun 21, 2011 11:04 am
Location: Mü-Sa
Contact:

Re: Git workflow

Postby cmb » Sun Jan 01, 2017 11:41 pm

The new workflow is prepared now.
Christoph M. Becker –Plugins for CMSimple_XH, but not for CMSimple 4+


Return to “Open Development”

Who is online

Users browsing this forum: No registered users and 1 guest