Re: git workflow for bugs and new feature !

[Kohei Yoshida <libreoffice@xxxxxxxx>]

On Thu, 2018-09-13 at 19:58 +0530, Rahul Gurung wrote:
> Hey,
> 
> 
> I always have a question in mind, what do you, professional
> developers follow as your GitHub workflow? I am curious about knowing
> two cases here, bugs and a new feature.

This project roughly follows what is sometimes referred to as "feature
branch workflow".  Also, be careful not to confuse git with GitHub when
discussing things like this.

> 
> For bugs:
> I read from the documentation that we should make a new branch for
> bug-killing but what after we pushed the code and it has been merged
> to master, what should we do with the local branch ? is rebase merge
> over master a good practice?

You can remove the local (as well as remote if one exists) branch after
it's been merged.  And yes, "rebase merge", or fast-forward merge is
required. I don't think we allow merge commits.

> For new feature:
> Should we make all the commits for the new feature over the same new
> branch?

I'm not sure I entirely understand your question, but if you are
talking about making multiple commits that are all for the same
feature, then I'd say keep all on the same feature branch created for
that specific feature.

> If possible, please tell the commands too, along with the answer.

The git commands required to create branches, push commits etc are
standard ones, and hopefully you can google about that?  The only thing
you need to be aware is that this project makes heavy use of gerrit for
handling patch submissions, so you may want to be familiar with gerrit
specific commands, as described in this wiki page:

https://wiki.documentfoundation.org/Development/gerrit

Kohei
-- 
Kohei Yoshida, LibreOffice Calc volunteer hacker
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice