2010/11/14 Alexander Neundorf <[email protected]>:
> Hi,
>
> the AddASM_NASMSupport branch (#10069) in staging is now good enough to be
> merged into next (or master ?).
>
> How does that happen ?
> Should I simply ignore staging and merge my local branch into next and push
> this ?
I don't know for merging to master, but the main interest of stage
is to be able to merge directly from stage to next without requiring
local branch.
What I do (as told by Dave or Brad I did not remember)
0) I suppose you did read this first:
http://www.cmake.org/Wiki/CMake/Git#Topic_Stage
1) You have your local branch <YourBranch> checked-out from master some time ago
You "stage-it" using:
git push stage HEAD
(But I think you already did that because I can see the branch
AddASM_NASMSupport | master=0 next=0)
2) Then you request stage to merge to next using:
ssh [email protected] stage cmake merge -b next <YourBranch>
Using this enables you (or anyone else using the stage branch)
to re-push several time from the staged branch
and then to next without trouble and it's ease the merge from next to master
for the guy doing it.
> Or should I ask you to merge that branch into master ?
> Should I try to merge into master myself ?
For this I don't know.
--
Erk
Membre de l'April - « promouvoir et défendre le logiciel libre » -
http://www.april.org
_______________________________________________
cmake-developers mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
