Hi Olaf, that's basically what I do. I must say that as gitflow was launched we couldn't use any of the scripts that propose. Don't remember why, but we had some problems at that time and never try It again.
But the concepts in [1] are in essence what I propose. In Royale everybody end committing in develop. That's wrong since it could break develop, so gitflow is the right way to go with the scripts proposed or handling it manually, we should do this as we develop some feature. The same goes for making hot fixes, releases, etc.. Thanks Olaf [1] https://danielkummer.github.io/git-flow-cheatsheet/ 2017-10-05 21:01 GMT+02:00 Olaf Krueger <[email protected]>: > I don't know if it is still used by people but am using the gitflow [1][2] > branching model here with our internal git repos and I am happy with it. > It is easy to create and merge feature, release, hotfix or other branches > by > using it and it follows some basic rules. > E.g. the command "git flow feature start test" create a feature brauch from > develop and "git flow feature finish test" merges the changes back to > develop and removes the feature branch. > > Just a thought... > Olaf > > [1] https://danielkummer.github.io/git-flow-cheatsheet/ > [2] https://github.com/nvie/gitflow/blob/develop/README.mdown > > > > > -- > Sent from: http://apache-royale-development.20373.n8.nabble.com/ > -- <http://www.codeoscopic.com> Carlos Rovira Director General M: +34 607 22 60 05 http://www.codeoscopic.com Conocenos Avant2 en 1 minuto! <https://avant2.es/#video> Este mensaje se dirige exclusivamente a su destinatario y puede contener información privilegiada o confidencial. Si ha recibido este mensaje por error, le rogamos que nos lo comunique inmediatamente por esta misma vía y proceda a su destrucción. De la vigente Ley Orgánica de Protección de Datos (15/1999), le comunicamos que sus datos forman parte de un fichero cuyo responsable es CODEOSCOPIC S.A. La finalidad de dicho tratamiento es facilitar la prestación del servicio o información solicitados, teniendo usted derecho de acceso, rectificación, cancelación y oposición de sus datos dirigiéndose a nuestras oficinas c/ Paseo de la Habana 9-11, 28036, Madrid con la documentación necesaria.
