this post was submitted on 28 Aug 2024
532 points (97.2% liked)
Programmer Humor
32721 readers
425 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
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
You need to merge more often.
Rebase. That's where the real trauma is.
Neither rebasing nor merging should cause trauma if everyone on the team takes a day or two to understand git
I consider myself above average in terms of Git know how. But I've come across situations using rebase where you're stuck resolving the same conflicts over several commits.
I still don't understand that part quite well.
This doesn't happen when you do a normal merge though. Making it easier to manage
You could try making enabling git's
rererefunctionality, which stands for "reuse recorded resolution"https://git-scm.com/book/en/v2/Git-Tools-Rerere
https://stackoverflow.com/a/49501436
Yeah I saw someone else's answer and I totally learned something new today.