this post was submitted on 24 Sep 2025
29 points (91.4% liked)
Privacy
3206 readers
95 users here now
Icon base by Lorc under CC BY 3.0 with modifications to add a gradient
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
I'm confused. That update is not conflict free. It resolved the conflict by deciding one of the two wins, without resolving the underlying difference (add and subsctract must be combined/summed up).
In my eyes, we resolved the difficulty by ignoring correctness.