mplot3d/contourf3d_demo2.py not committed

Benjamin Root <ben.v.root@...149...> writes:

Would a change to the v1.0.x branch "stay" on the v1.0.x branch, or is
there something I have to do to prevent subsequent merges from going
into master?

Since v1.0.x is supposed to be merged into master frequently, your
change would propagate into master. To prevent it:

1. make sure v1.0.x is merged into master (usually it is, but
   if not, start by doing that merge)
2. merge your change to v1.0.x
3. merge v1.0.x to master with

   git checkout master
   git merge --strategy=ours v1.0.x

This means that (1) the merge commit on top of v1.0.x will be in
master's history, so it will not be merged again; (2) the merge is done
by selecting the version of each file that is already in master, so the
contents of master do not change.

···

--
Jouni K. Sepp�nen
http://www.iki.fi/jks

Ok, thanks, I did that, and everything looks ok. I pushed the fixes up. Hopefully, the next merge doesn’t screw things up.

Ben

···

On Fri, Apr 15, 2011 at 9:27 AM, Jouni K. Seppänen <jks@…552…278…> wrote:

Benjamin Root <ben.v.root@…149…> writes:

Would a change to the v1.0.x branch “stay” on the v1.0.x branch, or is

there something I have to do to prevent subsequent merges from going

into master?

Since v1.0.x is supposed to be merged into master frequently, your

change would propagate into master. To prevent it:

  1. make sure v1.0.x is merged into master (usually it is, but

    if not, start by doing that merge)

  2. merge your change to v1.0.x

  3. merge v1.0.x to master with

    git checkout master

    git merge --strategy=ours v1.0.x

This means that (1) the merge commit on top of v1.0.x will be in

master’s history, so it will not be merged again; (2) the merge is done

by selecting the version of each file that is already in master, so the

contents of master do not change.

Jouni K. Seppänen

http://www.iki.fi/jks