• hellishharlot@lemmy.world
    link
    fedilink
    arrow-up
    8
    arrow-down
    1
    ·
    1 year ago

    Somehow I’ve made it 7 years without messing up a git command that I couldn’t fix in like 2 seconds. I primarily use vscode’s source controller more featured source controllers like sourcetree feel overly complex and typing out git commands is fine but you spend more time doing that than you would with vscode’s approach. I’m really curious about what you mean by fuck up a commit or push

    • BuiltWithStolenParts@lemmy.world
      link
      fedilink
      arrow-up
      7
      ·
      1 year ago

      Try reverting a reverted commit (revert of revert, yes) while other team members are working on a branch which has the first revert. It’s super fun merging after that.

      (Or something of that effect, can’t remember the exact details of that fuckup)

      • hellishharlot@lemmy.world
        link
        fedilink
        arrow-up
        4
        arrow-down
        1
        ·
        1 year ago

        I don’t think I will, mostly cause I work on a team of 1 right now which makes my branches wonderfully simple.