search

eternaldensity / Sandcastle-Builder

xkcd: 1190: Time: The Game
Other
84 stars 68 forks source link

Undo the undo of a 2016 PR #1518

Closed IHaveNoFunnyName closed 4 years ago

IHaveNoFunnyName commented 4 years ago

Sorry about the mess. I probably should have deleted the fork and started clean rather than try and salvage it.

Full story because I think it's funny:

I started working on a bugfix and noticed that old code from that PR was in my master. I pulled upstream/master but that merged it rather than overwriting, so it didn't really help. Frustrated I made a new branch from upstream/master, but just before I did so, entirely coincidentally, the 2016 PR was merged, so the old code was still in my branch. (idk why i'm writing passively here, it's not like anyone other than ED is going to read this). Completely freaked out and presuming it was a git bug at this point (the corruption in options.js didn't help) I manually undid the commits before fixing the bug. Which then undid the origional PR when it was merged too.

IHaveNoFunnyName commented 4 years ago

oh look i made the same mistake again and this PR is from master

eternaldensity commented 4 years ago

Um so is this a PR I should merge or shouldn't merge?

IHaveNoFunnyName commented 4 years ago

Should be merged. #1516 contains commits that undo #1443, and this fixes that.

eternaldensity commented 4 years ago

ah, got it, thanks.

charmsRace commented 4 years ago

idk why i'm writing passively here, it's not like anyone other than ED is going to read this

Don't tell me how to live my life! =P