gibbonweb/Hydrogen — comment on commit e255c95a817c977b266a79fac32c5a2dcfeb27b7
File:  line 0
By TomFrost:

Actually, with that said, I recommend undoing all the commits through the latest merge (git rebase -i , then in the editor, delete all lines except for the oldest one, then do a git commit origin +master), then do the merge again and this time take my copy fully over yours. I just say that because, should you ever do another pull request (or even if I try to merge something you do manually in the future), it's going to force me to take all of these commits as well, which would be a Bad Thing :). This is much easier to fix now than later.