you are viewing a single comment's thread
view the rest of the comments
[–] 5 points 2 years ago* (1 child)

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

  • source
  • parent
  • hideshow 1 child comment
  • [–] 10 points 2 years 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.

  • source
  • parent