Re: [leaf-devel] remote branch

[Erich T. <eri...@th...>]

Andrew

at 27.06.2011 10:33, Andrew wrote:
...
>>
> Yes, patches from commits now are applied mostly manually - due to 
> different dir structure. But possible 'git rebase' on stable branch 
> should be successful - so if changes are placed in stable bugfix branch, 
> master branch (and other branches) can be rebased and changes are merged 
> into it.

Looking at the rebase diagrams proves you wrong IMHO. Rebasing attaches
modifications to a different point in time in the main branch, it does
not merge these modifications into the main branch. So modifications mad
in another branch must be merged into the main branch should they need
to be permanent.

So the usage of ....fixed branches are somehow doubtful if they are nor
merged.

cheers

Erich