Joined 3/18/2022, 2:10:00 PM has 764 karma
Ask HN: What is your approach to dealing with merge conflicts day in / day out?