search

pjf / masterwork-dwarf-fortress

Patches and bugfixes applied to Meph's amazing Masterwork Dwarf Fortress
33 stars 22 forks source link

Razing/Digging Invaders and GUI Updates #117

Closed splintermind closed 10 years ago

splintermind commented 10 years ago

I'm not sure why it's identifying so many commits, but it's only the last 4 you haven't already merged.

pjf commented 10 years ago

Pull requests will try and merge all changes on a branch since they last diverged, and because I've been cherry-picking, splitting, and merging some of your commits, git thinks that was quite a while in the past.

If you want some advanced git-fu, the recommend way of doing pull requests is make a "feature branch" off the latest remote, put all related commits into that, and then send a pull request. There's a few tutorials floating around, including this one from Atlassian which explains the general concept.

In the meantime, if you want to reset your branch to be the same as the upstream head, I've added a section on how to do that to the contributor's guide. But don't do that until after I've said that I've merged your changes here. :) (Technically I can still merge them if you do, but it will probably require me to make a skill-check against changeomancy.)

~ pjf

pjf commented 10 years ago

Okay, all merged. I've squashed all the #106 changes into a single commit (so you can apply all of them, or none of them), and teased out some accidental whitespace-only changes that came in with 2373b11 (and tweaked the commit message to indicate what the duplicate colour was).

~ pjf

pjf commented 10 years ago

And many thanks for this! I'm looking forward to digging/razing invaders knocking down my fort. :)