Skip to content
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

Backport issue #74 (Ensure geographic projection in pscoast) from master #79

Closed
wants to merge 96 commits into from

Conversation

joa-quim
Copy link
Member

No description provided.

joa-quim and others added 30 commits October 26, 2017 19:47
…t exist saying the file is not COARDS conformal.
@PaulWessel
Copy link
Member

I don't understand why there is so much in this PR. Help me understand.

@joa-quim
Copy link
Member Author

Neither do I. This bloody git is a complicated thing. I don't know where it got all those changes.
Closing this PR

@joa-quim joa-quim closed this Sep 20, 2018
@joa-quim
Copy link
Member Author

And another incomprehensible thing is that the changes to pscoast where applied to 5.4 I don't know how.

@leouieda
Copy link
Member

If you look at the top of the PR (below the title) it says that "joa-quim wants to merge 96 commits into master from 5.4". That means that all commits from master would be applied to the 5.4 branch, which is probably not what you want.

The 2 commits from Joaquim and 1 from Remko ended up in branch 5.4. I'm guessing Joaquim did a git checkout 5.4 and git merge master or something like that locally. There is no record of this on Github PRs.

The command for picking a single commit from one branch to another is git cherrypick. I'll try this out now and post back how it works.

@leouieda
Copy link
Member

As a rule, don't merge master into 5.4. Always make a branch starting from 5.4 and submit a PR through Github selecting 5.4 as the base.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants