this post was submitted on 28 Aug 2024
523 points (96.9% liked)

Programmer Humor

32041 readers
977 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] 5 points 3 weeks ago* (last edited 3 weeks ago) (1 children)

You could try making enabling git's rerere functionality, which stands for "reuse recorded resolution"

https://git-scm.com/book/en/v2/Git-Tools-Rerere

https://stackoverflow.com/a/49501436

[โ€“] [email protected] 1 points 3 weeks ago

Yeah I saw someone else's answer and I totally learned something new today.