There is a somewhat similar workflow that is more popular and better supported by "boxed" tools, called "git flow":
https://github.com/nvie/gitflow (the main difference seems to be readily available wrapper tools for branch management, and "devel" branch). I recommend we adopt that once we have got started. It is also natively supported by SourceTree (i.e. there is "git flow" menu). >From the start though, we don't necessarily need to adopt a "sophisticated" flow like this, committing directly to master on first few weeks while adapting to git seems ok. Even that will have benefits over bzr we are currently using. I.e. I don't want to see "too complicated workflow" becoming an obstacle in adopting git. On Wed, Jan 8, 2014 at 2:12 AM, gf <[email protected]> wrote: > On Tuesday, January 7, 2014 7:38:51 PM UTC+7, Ville M. Vainio wrote: > >> Hey, >> >> I guess it's pretty clear that migrating the repo from bzr won't be a big >> problem. >> >> Are we otherwise clear on how to work with git? I guess the flow won't be >> perfect from the get-go, i.e. we would continue using it quite a bit like >> bzr - committing directly to master, merges instead of rebases etc. >> >> I also recommend win/mac users to check out SourceTree, which is quite >> handy once you have grasped the basic git use: >> >> http://www.sourcetreeapp.com/ - private <http://www.sourcetreeapp.com/> >> > > > > Hi, > > The git workflow adopted by the IPython developers is here: > > > http://ipython.org/ipython-doc/dev/development/gitwash/development_workflow.html > > I believe that they gave this quite a bit of thought before adopting it. > > -gyro > > -- > You received this message because you are subscribed to the Google Groups > "leo-editor" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at http://groups.google.com/group/leo-editor. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/groups/opt_out.
