search

OneDaijo / daijo-contracts

Apache License 2.0
6 stars 2 forks source link

Token sale rename #45

Closed nickdeng4 closed 7 years ago

thiefinparis commented 7 years ago

Just FYI, both this PR and https://github.com/WorldRapidFinance/wrf/pull/44 are failing CI because of the QINFrozen.sol artifacts are missing. This PR seems unrelated to QINFrozen.sol. They seem to have a bunch of the same commits. I'm assuming this is because you didn't branch directly off of master. In general, branching one PR off of another makes review and merging really difficult. I'm assuming this was accidental...? If you'd like, we can close this PR, I can make a new branch with these commits rebased onto master, and you can PR that branch.

nickdeng4 commented 7 years ago

Okay, that might be for the best. I was having trouble with making commits to multiple branches so I must have messed something up along the way.

thiefinparis commented 7 years ago

Okay, I rebased and made you a branch: token_sale_rename_master. Feel free to close this and open a PR with that branch if you want.

Fun story, I accidentally committed as my other GH account (it pulls it from the git config, and I was accidentally ssh'd into a different machine). That account showed up as the secondary author (committed with). So I needed to reset it to keep that weird GH account out of this repo, but resetting the author removed you as the main author and gave me credit for the commit. That wasn't good. So I changed my git config to make me you and committed as you. So, apparently you can impersonate anyone (and have the commit link to their account) when you commit. @Miroxin is probably all over this.