Am Mittwoch, 15. Februar 2012, 16:30:31 schrieb Jaroslaw Staniek: > On 15 February 2012 10:04, Friedrich W. H. Kossebau <[email protected]> wrote: > > Hi, > > > > in other projects I have got used to the habit that, when updating a > > work > > branch to the lastest changes in the master branch, to rather rebase the > > work branch to the master branch instead of merging the commits from > > it, to keep a clean history in the branch itself, which I have found > > useful. > > > > Is this approach allowed/supported for the Calligra repo? I would then > > do that with "my" filters-karbon-cdr branch. > > > > On other notes: > > I accidentally pushed an old branch "CDRImport" to the official repo. > > But it seems I cannot remove it again? Could someone with the proper > > super-powers please help out? > > Hi, > I think you cannot edit history (rebase) once you made it publish > because others might have fetched it already, > i.e. you can rebase locally before you push; and this is what I do for > the reason you expained. > > So it's too late if you already pushed.
Sigh, I feared this answer, so that is the price to develop my cdr import filter in a branch "in the public". Okay, will then resist to get the latest master changes in my branch for now. So, on the other note: who could remove that bogus branch "CDRImport"? Cheers Friedrich _______________________________________________ calligra-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/calligra-devel
