[Kde-scm-interest] Re: GSoc branch best practices

[Boudewijn Rempt]

On Saturday 30 April 2011 Apr, Marcel Wiesweg wrote:
> Hi all,
> 
> I would be interested on best practices with git branches for our gsoc 
> students, assuming the students do not work on master.
> 
> With SVN, we always had one dedicated branch for all students, regularly 
> synced with trunk. With git, I see some more possibilities:
> 
> 1) One branch per student
> 	1a) regularly rebased on master
> 	1b) changes regularly merged from master, merged to master at finish
> 2) One branch for all students, merged at finish
> 
> Any KDE projects with experience from last year? Plans for this year?
> 
> (Btw, is it now possible to rebase branches in KDE git like 1a?)

For Krita (and Calligra) it's the most important thing that the student isn't in a special position. They should do exactly the same thing as all the other developers: big features in a branch that gets merged when its done, small stuff directly in master (for now, we're working on a new workflow), communicate everywhere and blog.

-- 
Boudewijn Rempt | http://www.valdyas.org, http://www.krita.org