[eclipse-arduino-dev] Re: Git Flow

  • From: Jan Baeyens <jan@xxxxxxxxxx>
  • To: eclipse-arduino-dev@xxxxxxxxxxxxx
  • Date: Tue, 5 Apr 2016 16:31:32 +0200

Japan .... wow. I hope it is not all office for you.
http://www.timeanddate.com/worldclock/meetingtime.html?iso=20160406&p1=48&p2=248&p3=215
8 o'clock in the evening is 1 o'clock here.
I can not do this tomorrow but untill now the rest of the week is free.



Op 5/04/2016 om 16:10 schreef Wim Jongman:

I can only do evenings. I am in Japan right now. 8 hours ahead of GMT

On Tue, Apr 5, 2016 at 12:00 PM, Roberto Lo Giacco <rlogiacco@xxxxxxxxx <mailto:rlogiacco@xxxxxxxxx>> wrote:

    Do we want to schedule a meeting about this?

    I don't know everybody's timezone, so I'll just suggest something
    which can be comfortable for me: Saturday ​9th of April 11.00 AM GMT

    On Sat, Apr 2, 2016 at 8:30 PM, Roberto Lo Giacco
    <rlogiacco@xxxxxxxxx <mailto:rlogiacco@xxxxxxxxx>> wrote:

        Well, I'm GMT+1 so it's about 20.30 for me now... In an hour
        or so I'll be out for a few drinks...

        If you wish to use hangouts you already know my email ;)


        Il sabato 2 aprile 2016, Wim Jongman <wim.jongman@xxxxxxxxx
        <mailto:wim.jongman@xxxxxxxxx>> ha scritto:

            I can do today. Then I will be overseas for a week.

            On Sat, Apr 2, 2016 at 4:13 PM, Roberto Lo Giacco
            <rlogiacco@xxxxxxxxx> wrote:

                When do you want to do it? Because I have a few
                changes now and planning to start working on more...
                almost all of them on the UI and it's probably the
                best time to start with this if we decide so...

                Roberto

                On Sat, Apr 2, 2016 at 10:06 AM, Roberto Lo Giacco
                <rlogiacco@xxxxxxxxx> wrote:

                    Count me in too

                    On Fri, Apr 1, 2016 at 8:12 PM, Jan Baeyens
                    <jan@xxxxxxxxxx> wrote:

                        I'm in

                        Op 1/04/2016 om 19:22 schreef Wim Jongman:
                        How about we schedule conference call with
                        this as one of the topics.



                        On Tue, Mar 15, 2016 at 5:17 PM, Jan Baeyens
                        <jan@xxxxxxxxxx> wrote:

                            I got a bit of a flu right now so this is
                            to heavy for me right now.
                            I will handle this later
                            Jantje

                            Op 14/03/2016 om 13:01 schreef Wim Jongman:
                            and this [1] (Eclipse integration)

                            [1]
                            
http://eclipsesource.com/blogs/2015/06/22/git-flow-top-eclipse-mars-feature-3/


                            On Mon, Mar 14, 2016 at 11:59 AM,
                            Roberto Lo Giacco <rlogiacco@xxxxxxxxx>
                            wrote:

                                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














Other related posts: