this post was submitted on 22 Jul 2023
278 points (97.3% liked)
Programmer Humor
20039 readers
3377 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 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Sometimes there's no other option when someone merged develop into master just before a critical bug was found.
You can always revert (i.e. undo in a new commit) the faulty commit. That will keep the history. This meme is not just about pushing straight to master, it's about
push --forcewhich overwrites the remote branch completely, changing history.What happens when you want to merge again? Won't it say already up to date or something cause the commits are already there?
You could just rebase your develop branch to a commit before the merge and have a different commit history, or actually do it properly and have squash merges.
If you have big features that deletes a lot of maybe important commit history.