• zalgotext@sh.itjust.works
    link
    fedilink
    arrow-up
    5
    ·
    edit-2
    1 year ago

    git rebase -i origin/main (or whatever branch you’re rebasing on), then read the instructions that come up in the editor window

    • corytheboyd@kbin.social
      link
      fedilink
      arrow-up
      10
      ·
      edit-2
      1 year ago

      Read… instructions? I love teaching people that git very often prints out what you should do next.

      git: “to continue, resolve conflicts, add files, and run rebase —continue”
      dev: …time to search stack overflow

      All that said… just use lazygit. It does help to know CLI git first to put things in context, but if you do, no need to punish yourself every day by not using a UI.