a thoughtful web.
Share good ideas and conversation.   Login or Take a Tour!
comment
wasoxygen  ·  171 days ago  ·  link  ·    ·  parent  ·  post: Git is simply too hard

    "Oh, I just pushed a change. I really didn’t wanna push that, so how do I undo it?"

    So from their perspective, that’s a really reasonable question to make. And then I’m just like:

    "I’m sorry… This is gonna sound like I am teasing you or that I’m mocking you, but actually I’m really being frank, and I’m gonna give you my advice. It’s just not gonna be great."

How to undo (almost) anything with Git

    Scenario: You just ran git push, sending your changes to GitHub, now you realize there’s a problem with one of those commits. You’d like to undo that commit.

    Undo with: git revert <SHA>

    What’s happening: git revert will create a new commit that’s the opposite (or inverse) of the given SHA.

Same idea as accidentally saving a messed-up version of a Word doc on a folder shared with collaborators: you fix your copy of the file and save it again. With Git you don't even have to figure out how to undo the mistakes.

I think the complications arise because Git is robust to difficult but unavoidable cases like edit conflicts. Consistency is tricky to get right.

Does #TinCan rely on timestamps to order comments? Has anyone tried having a group conversation?