this post was submitted on 27 Apr 2024
616 points (98.3% liked)
Programmer Humor
19480 readers
183 users here now
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
Rules
- Keep content in english
- No advertisements
- Posts must be related to programming or programmer topics
founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Gotta review the 5 line PR ten times just to make absolutely totally sure there's nothing wrong with it before submitting it.
And then notice the spelling error.
Instant commit --amend + push --force
Prefer
--force-with-lease. It doesn't make a difference in this scenario, but it's a safer habit/default.There is no reason to force push anymore - force with lease is always preferable. So said, a frequent rebaser.
Wait what is the difference between the two?
Force with lease will send up what your local thinks the most recent commit on the branch was and the host will reject the push if it knows of a more recent commit on that branch. Basically, it saves you from overwriting a commit you didn't realize existed.