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

Add example in xyz2grd #167

Closed
wants to merge 2 commits into from
Closed

Add example in xyz2grd #167

wants to merge 2 commits into from

Conversation

anbj
Copy link
Contributor

@anbj anbj commented Nov 7, 2018

Add man page example in xyz2grd.rst. I see that my old commit also is included in this PR.

@PaulWessel
Copy link
Member

Could you remove your old commit from this one since those changes are already in master?

@anbj
Copy link
Contributor Author

anbj commented Nov 7, 2018

Will try - not fluent in github yet.

@PaulWessel
Copy link
Member

Likewise...

@seisman
Copy link
Member

seisman commented Nov 7, 2018

@abanbj You need to rebase your add-example-in-xyz2grd with gmt's master branch.

Assuming that you have a local copy and have added the gmt official repo as a remote repo and named it as upstream. You can follow these steps to rebase your branch:

git fetch upstream master   # fetch the latest master branch from upstream
git checkout add-example-in-xyz2grd  # switch to your branch
git rebase upstream/master   # rebase your branch with gmt's master branch
# push your local branch to your github repo
# you need -f option to force pushing, since rebasing changed the commit history of the branch
git push -f                   

@anbj anbj closed this Nov 8, 2018
@anbj anbj deleted the add-example-in-xyz2grd branch November 8, 2018 06:36
@anbj anbj restored the add-example-in-xyz2grd branch November 8, 2018 06:37
@anbj
Copy link
Contributor Author

anbj commented Nov 8, 2018

Thank you for helping me out @seisman. Made a new PR!

obaney pushed a commit to obaney/gmt that referenced this pull request Aug 18, 2021
Allows us to get access to the GMT version and default paths to cache
folders, etc.

Fixes GenericMappingTools#167

Introduces a dependency on the `packaging` module to compare version
numbers. This is usually installed with setuptools anyway.
Will be needed later on to check if using GMT 6.
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

3 participants