search

deeplycloudy / lmatools

Python code for working with VHF Lightning Mapping Array data
BSD 2-Clause "Simplified" License
22 stars 23 forks source link

Pull Request 2 #10

Closed Vsalinas91 closed 8 years ago

Vsalinas91 commented 8 years ago

Realized that the initial pull request did not have the changes as it was done in the wrong repo.

deeplycloudy commented 8 years ago

It looks like your forked copy of lmatools doesn't have the new flashsortrefactor branch (you're on master), but it's being merged into my flashsortrefactor branch. And oddly, my commits to that branch have now turned into one big blob of commits under your username. What I was expecting to see was mostly my commits, and then a few commits from you with relatively small changes. When you forked/cloned/updated, how did you do it?

If I did this more regularly, I'd be able to diagnose this right away, so we'll have to learn what's going on here together.

Vsalinas91 commented 8 years ago

I re-pulled from the master branch, as that is the only option, then did a git checkout [branch], which then said I was working in that branch, I guess that's were the issue is.

I honestly don't know what I am doing now. I cleared my lmatools forked repo (now empty) but can't seem to pull anything by doing a:

git remote add upstream [url-to-your-repo] flashsortrefactor

My repo remains empty now.