[cmake-developers] Rebase or not?

[Eric Noulard]

Hi,

Now that 2.8.7 is out I'd like to continue my work on CPack
documentation improvement.

My branch on stage is: ImproveCPackDoc
I did merge it to next on nov 13:
22236e48938b942a8b9d95d73d447fa5e54e19a0

see http://public.kitware.com/Bug/view.php?id=10067 as well.

This topic has never been merged to master.

How shall I continue:
  1) Go on with current branch and push to stage HEAD, merge to next
when ready etc... as usual

  2) Delete old stage branch
      Rebase on current master
      re-push to stage HEAD?


-- 
Erk
Membre de l'April - « promouvoir et défendre le logiciel libre » -
http://www.april.org