Programmer Humor

32479 readers

226 users here now

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

Rules:

Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.

founded 5 years ago

MODERATORS

[email protected]

526

It happens each time! (lemmy.world)

submitted 2 months ago by n3cr0 to c/[email protected]

55 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] CMahaff 3 points 2 months ago (1 children)

Another solution to this situation is to squash your changes in place so that your branch is just 1 commit, and then do the rebase against your master branch or equivalent.

Works great if you're willing to lose the commit history on your branch, which obviously isn't always the case.

[–] [email protected] 2 points 2 months ago

Yeah that's what I did as a workaround. Reset (soft) to the first parent commit and do a single commit with all the changes.