search

jjhelmus / nmrglue

A module for working with NMR data in Python
BSD 3-Clause "New" or "Revised" License
211 stars 86 forks source link

Merge pull request #1 from jjhelmus/master #25

Closed SamuelFigueroa closed 9 years ago

SamuelFigueroa commented 9 years ago

Update

jjhelmus commented 9 years ago

I do not want un-needed merge commits in the master nmrglue history such as this.

It appears that you are trying to sync your folk with mine. Rather than creating and merging a pull request to accomplish this a better method is to fetch and merge from an upstream repository:

git remote add upstream https://github.com/jjhelmus/nmrglue.git
git fetch upstream
git merge --ff-only upstream/master

With this your branch should be up to date with the main nmrglue repository.

jjhelmus commented 9 years ago

Closing this PR without merging. Feel free to open if there is a need for this to be merged.

SamuelFigueroa commented 9 years ago

Thank you, will do. Sorry about that.