[cmake-developers] hot to get something from stage to next or master ?

[Alexander Neundorf]

On Monday 15 November 2010, you wrote:
...
> The stage is the most important part of this new workflow. Apparently
> we haven't effectively communicated that to everyone here on the CMake
> developers' list.


I have a problem/question here.
I did "ssh git at cmake.org stage cmake merge -b next ImprovedDotSupport2"
to merge that branch into next on stage.
Now the merge got a conflict, and suggested to do the following:

"Topic 'ImprovedDotSupport2' does not merge cleanly into next.
Merge manually using commands such as the following:

  git fetch "git://cmake.org/stage/cmake.git" "ImprovedDotSupport2"
  git branch "ImprovedDotSupport2" 78c86f4
  git checkout next
  git pull origin next
  git merge "ImprovedDotSupport2"

Resolve the conflicts manually.  Then:

  git commit
  git push origin next"


I haven't done the final push yet.
Is it ok to do that push ?
Doesn't that go around the stage then again ?

Alex