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

[Arno Rehn]

On Saturday 30 April 2011 21:39:55 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?
Branches in git are cheap, so I'm all for giving each student his/her own 
branch.

> (Btw, is it now possible to rebase branches in KDE git like 1a?)
While possible, it requires forced pushes because history is will be 
rewritten. So merging will be the only possibility if you want to publish the 
branch and have other people following it without much hassle. The merging 
doesn't have to be regular, though - only merge master into the feature 
branch, if you really need new stuff from there.

-- Arno