this post was submitted on 09 Nov 2023
1274 points (98.3% liked)

Programmer Humor

32061 readers
1992 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] zalgotext@sh.itjust.works 5 points 10 months ago* (last edited 10 months ago) (1 children)

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 10 points 10 months ago* (last edited 10 months 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.