search

GraylinKim / sc2reader

A python library that extracts data from various Starcraft II resources to power tools and services for the SC2 community. Who doesn't want to hack on the games they play?
http://sc2reader.readthedocs.org
MIT License
411 stars 85 forks source link

adding a missing change from the list #163

Closed StoicLoofah closed 10 years ago

StoicLoofah commented 10 years ago

This may or may not be correct, but I happen to be using SelfAbilityEvent, and from my 10 second look at 2b35c07, I think was the change that was made.

This is only somewhat related, but git question: I initially tried to submit this pull request, but there was a bunch of crap in there, including a bunch of merges from upstream/master into my fork's master. I ended up resetting my fork's master to upstream/master and doing a push -f to get things lined up. Since I haven't developed any custom features, I figure I should just keep my master matching upstream/master and do all of my work in feature branches. Then, I'll get them back onto my master when they're (hopefully) integrated into upstream/master, and I can just fast-forward. Was that the right thing to do?

coveralls commented 10 years ago

Coverage Status

Coverage decreased (-0.03%) when pulling 1d9c141e4db4a972bea2ec2058f3e410de1e9894 on StoicLoofah:update-0.7-changelog into 665cc1245f60f6c2b0bd837a664390b719ab5bd5 on GraylinKim:master.

GraylinKim commented 10 years ago

You are right, SelfAbilityEvent was renamed. Good catch on that omission.

I would recommend keeping the branch tracking upstream master in your fork clean and working on feature branches. This way you can always sync upstream with a fast-forward. If you don't want to wait for me to merge your feature branches you can maintain a personal branch that doesn't track upstream and do your own merges there.