Merge colorpicker changes into release

[chaosphere2112]

No description provided.

[chaosphere2112]

@aashish24 This merges my PR and Remi's into release

[aashish24]

? no reviews?

[chaosphere2112]

I just merged over from master; it was code that was already reviewed, and both Remi and I had aimed at the wrong branch.

From: Aashish Chaudhary <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Friday, May 1, 2015 2:20 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Fries, Samuel B." <fries2@llnl.govmailto:fries2@llnl.gov>
Subject: Re: [uvcdat] Merge colorpicker changes into release (#1257)

? no reviews?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/1257#issuecomment-98241166.

[chaosphere2112]

that said, we can back out the changes. I just figured it wasn't a big deal.

[aashish24]

no problem. okay, but create a new branch, so that the we have a proper name of the branch.

[chaosphere2112]

😕 You want me to do what exactly?

[aashish24]

On the top it says:
chaosphere2112 merged 3 commits into release from master 27 minutes ago

which means that you are directly merging from master into release. Intstead you would do:

git checkout bring_fix_foo origin/master
git push origin HEAD

and then will do a pull request on that. In that way we know (without github interface) what change you bought in in git log or gitk --first-parent

[chaosphere2112]

ah, gotcha.

[chaosphere2112]

Will do!

[aashish24]

thanks 👍