New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge colorpicker changes into release #1257

Merged
merged 3 commits into from May 1, 2015

Conversation

Projects
None yet
3 participants
@chaosphere2112
Contributor

chaosphere2112 commented May 1, 2015

No description provided.

Sam Fries and others added some commits Apr 29, 2015

Merge pull request #1246 from chaosphere2112/colorpicker_missing_widgets
Colorpicker now uses manager correctly
Merge pull request #1240 from UV-CDAT/fix-cdms-exceptions
Fixes typo in CDMS raise statements
@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented May 1, 2015

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

chaosphere2112 added a commit that referenced this pull request May 1, 2015

Merge pull request #1257 from UV-CDAT/master
Merge colorpicker changes into release

@chaosphere2112 chaosphere2112 merged commit b93c51c into release May 1, 2015

0 of 3 checks passed

continuous-integration/kitware-buildbot Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build failed
Details
@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 1, 2015

? no reviews?

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented May 1, 2015

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

This comment has been minimized.

Contributor

chaosphere2112 commented May 1, 2015

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

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 1, 2015

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

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented May 1, 2015

😕 You want me to do what exactly?

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 1, 2015

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

This comment has been minimized.

Contributor

chaosphere2112 commented May 1, 2015

ah, gotcha.

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented May 1, 2015

Will do!

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 1, 2015

thanks 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment