Closed sol-oriens closed 6 years ago
It's usually a better idea to work on the latest development branch, because it avoids merge conflicts. (Plus you'd have noticed that I already pulled the drydock fix. :P)
Also, why do your commits contain so many 'phantom' line changes? There must have been at least a dozen conflicts in Asteroid.as, with no apparent change in content...
As I wasn't sure where / when you want to push the changes, I favored for master so you choose when to include them. False positives on the diffs are a minor annoying issue with my editor, I just got used to it. Not sure I can do anything about it (except changing editor...).