I've found this http://danielkummer.github.io/git-flow-cheatsheet/
interesting
On Mon, Mar 14, 2016 at 11:14 AM, Wim Jongman <wim.jongman@xxxxxxxxx> wrote:
More read here [1]
[1] https://leanpub.com/git-flow/read
On Mon, Mar 14, 2016 at 10:42 AM, Roberto Lo Giacco <rlogiacco@xxxxxxxxx>
wrote:
Count me in if Jantje is willing to go down that route
On Mon, Mar 14, 2016 at 9:46 AM, Wim Jongman <wim.jongman@xxxxxxxxx>
wrote:
Jantje has been working on the bigChange branche for quite some time
whilst hot fixes where pushed to master. Maybe you are not aware of this
but a lot of people have been discovering this workflow. This has resulted
in a bunch of git commands that are now known as *Git Flow*.
Git Flow has support in Eclipse. It works like this:
There are two main branches, *master* and *develop*. The develop branch
has the exact same purpose as Jan's bigChange branch. It enables you to
make big changes without loosing track of what the people are using. It is
used to work towards a new release. *Nightly* should be build from
*develop* and *release* should be build from *master.*
*Is this all?*
Yes and no. Yes, in that this is the essence of Git Flow. No because why
would you want to make it simple.. Before I tell you about the other nice
features. I have to explain one term that Git Flow uses: *Feature*. A
features is basically a new fix, an added function, etc..
The other principles Git Flow has are:
* All changes are done in *Feature Branches* which are typically named
after the issue number (e.g. 321, 332, etc..)
* When a feature is done, it is merged back into the develop branch (and
a new nightly is build).
* All changes to master are done in *Hot Fix* branches,
* When a hot fix is done, it is merged back into master (and a new
release is build)
*I propose to move over to the** Git Flow principle **after April 1.*
I am more than happy to give a lesson about git and git flow. Life is so
much more beautiful when you get git than if you "just use it" without
fully understanding it.
Cheers,
Wim
