• RobotZap10000@feddit.nl
    link
    fedilink
    arrow-up
    1
    ·
    5 months ago

    Step 1. Forget to push local commits

    Step 2. Push commits from another machine

    Step 3. Pull from remote om the first machine

    I’m a bit of a noob, I often do this when I get too careless.

    • nous
      link
      fedilink
      English
      arrow-up
      2
      ·
      5 months ago

      That should not break things though. Maybe get a merge conflict that you need to sortout at worst. This is essentially the constant state of working with other people on a project.