this post was submitted on 28 Aug 2024
532 points (97.2% liked)

Programmer Humor

32724 readers
159 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
[โ€“] [email protected] 3 points 3 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 3 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.