want to make additional documentation changes, restart the
> process with a new branch.
> >
> > .. note:: Make sure that your changes are in `upstream/master` before
> you delete your `dev` and `origin/dev` branches!
> >
> > You can delete these deprecated bra
with the following:
>
> .. code:: bash
>
> $ git checkout master
> $ git branch -D dev
> $ git push origin :dev
>
>
>
> On Fri, May 23, 2014 at 9:01 AM, Will Stevens
> wrote:
> All good feedback. Thanks.
>
> I will rework this on Mon
> > -Original Message-
> > From: rohityada...@gmail.com [mailto:rohityada...@gmail.com] On Behalf
> Of Rohit Yadav
> > Sent: 23 May 2014 11:35
> > To: dev@cloudstack.apache.org
> > Cc: Sebastien Goasguen; Pierre-Luc Dion
> > Subject: Re: [DOCS] Git Flow
>
akes the whole workflow
much simpler.
>
> --
> Stephen Turner
>
>
> -Original Message-
> From: rohityada...@gmail.com [mailto:rohityada...@gmail.com] On Behalf Of
Rohit Yadav
> Sent: 23 May 2014 11:35
> To: dev@cloudstack.apache.org
> Cc: Sebastien Goasguen; Pie
Rohit
Yadav
Sent: 23 May 2014 11:35
To: dev@cloudstack.apache.org
Cc: Sebastien Goasguen; Pierre-Luc Dion
Subject: Re: [DOCS] Git Flow
Hi,
Good effort. Will you should also see this and update the wiki as needed:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
I would say, squashed merge
Hi,
Good effort. Will you should also see this and update the wiki as needed:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
I would say, squashed merges are much better when you're going through list
of changes [1] instead of having a branch based workflow,
reverting/fixing/bisecting
I'm not a fan of squashed merges myself, because you lose the history, which
can often contain useful check-in comments.
My preferred github workflow is to make a new local branch before starting any
change, push that to a branch in my fork of the project on github, and then
send a pull request
On May 22, 2014, at 10:35 PM, Will Stevens wrote:
> Hey All,
> In the the README.rst files in the documentation, it refers to this page if
> you want to contribute: http://cloudstack.apache.org/developers.html
correct, and yes this page does not explain how to do a pull request
>
> I am not
