search

lkilcher / dolfyn

A library for oceanographic doppler instruments such as Acoustic Doppler Profilers (ADPs, ADCPs) and Acoustic Doppler Velocimeters (ADVs).
BSD 3-Clause "New" or "Revised" License
43 stars 26 forks source link

Crop tools #9

Closed lillieogden closed 7 years ago

lillieogden commented 7 years ago

Creating a crop tools branch and adding tools.py to dolfyn.adv

lkilcher commented 7 years ago

@lillieogden I'm not really sure how this happened, but this is still the wrong branch. There should only be one (or two) commits and one file changed, not 154 and 31. Why don't you delete this branch (from your local repo, AND github), then do this:

git checkout master
git checkout -b 'crop_tools2'

Then add your files. Then do:

git push -u origin crop_tools2

I suspect that you either: a) did not delete the branch on github, or b) did not do the first git command above when you created a new branch (i.e. you've got to be on the branch you want to branch from when you create a new one with git checkout -b).

lkilcher commented 7 years ago

Then create a new PR that points to crop_tools2.

lillieogden commented 7 years ago

@lkilcher I am not sure how this happened but my master branch is back to being 30 commits behind you. I tried the following code git fetch upstream git merge upstream/master --ff-only git reset --hard upstream/master but it didn't work. Is it possible that the pull request I sent you included those changes to the master branch in addition to the new branch and that was why there were so many commits? Either way, I am at home trying to trouble shoot this and read about mpld3.

lkilcher commented 7 years ago

Check to make sure that you are on master when you run that last command. Also, check to confirm that upstream points to my repository (origin should point to yours).

lkilcher commented 7 years ago

Also, I don't think you need the merge command.