Working on master



  • So I did a few changes for a site. Deployed to staging, told the customer they could check it out there. Well, it could take months because they want to talk to all stakeholders. Well, you do that. Forgot about it.

    Then one of my peers comes along, fixes a few things on the same site, deploys to staging, then gets an error. Asks me about that error, well that's because :wtf: damn I left junk on the master branch and now he's based his stuff on top of that.

    Well great, nonexisting procedures were not followed I guess. Seriously, I was too lazy to create a branch for that, and now I have to do it after the fact.

    :wave: over here, rewriting your history.



  • @gleemonk said:

    over here, rewriting your history.

    Try not to save your father from an accident and have your mother fall in love with you, and you're set.

    (also, is there no better way to sort it out? AIUI, that guy's code is toast anyway - can't you revert everything to before you started polluting the master and then branch out with your local code, or something?)



  • @Maciejasjmj said:

    Try not to save your father from an accident and have your mother fall in love with you, and you're set.

    and don't become your grandfather. it may make a loop in your family tree.



  • @Maciejasjmj said:

    Try not to save your father from an accident and have your mother fall in love with you, and you're set.

    If I read that right. Ewwwww.

    However, this simple change: Try not to save your father from an accident and have your mother fall in love with youhim, and you're set.

    Makes perfect sense with the context of the WTFy of the OP's opening post. Thus the "...and you're set..." can be inferred to mean: No meetee, no lovee, no giggy gigee, no OPee, no WTFee. :laughing:


  • Discourse touched me in a no-no place

    @loose said:

    If I read that right. Ewwwww.

    Have you not seen Back to the Future?



  • Unfortunately, [spoiler]yes[/spoiler]



  • @FrostCat said:

    Have you not seen Back to the Future?

    Or that one episode of Futurama.


  • Discourse touched me in a no-no place

    @blakeyrat said:

    Or that one episode of Futurama.

    Yeah, but he didn't quote the become your own grandpa bit.



  • Guys, your missing the point. Marty McFly had to ensure his mum and dad met so he would be born, because by being back in the future, he (indirectly) fucked up what happened.

    Cue, Larry Niven's Flight of the Horse et al, and Issac Asimov's Anywhen

    Opps, forgot to say I inferred that @Maciejasjmj meant to imply that the only way the OP can rectify his :WTF: is to ensure he was or born.

    BTW, +10 Internets for @gleemonk for coming clean about this :thumbsup: It took real courage to to that in front of this community.

    :hanzo: No. 2

    Issac Asimov's Anywhen

    Should Read:

    Asimov's End of Eternity, James Blish's Anywhen

    :hanzo: No. 3

    is to ensure he was or born.

    Should read:

    is to ensure he was not born


  • Discourse touched me in a no-no place

    @loose said:

    your missing the point

    My nothing is missing the point.



  • @Maciejasjmj said:

    (also, is there no better way to sort it out? AIUI, that guy's code is toast anyway - can't you revert everything to before you started polluting the master and then branch out with your local code, or something?)

    In the end, I decided to revert my commits on master. Luckily there were no conflicts. So history was polluted, and will be polluted even more, once I patch my stuff again. Upsets my sense of cleanliness.



  • I'm My Own Grandpa (Grandpa Jones) – 02:41
    — TheHistoryspartan


Log in to reply
 

Looks like your connection to What the Daily WTF? was lost, please wait while we try to reconnect.