Oddbean new post about | logout
 @e277f9e5 Yeah, seasoned git users are pretty much dealing with merge conflicts on a regular basis, quite like how I sometimes end up hand-editing patch files. 
 @Haelwenn /элвэн/ :triskell: There is nothing wrong with hand-editing patch files by definition but you should definitely test if your edit still applies the patch correctly expecting before committing it. 
 @e277f9e5 Yeah of course, which is why sometimes I also end up manually applying the patch myself with adjustments on the fly to then regenerate the patch file. 
 @Haelwenn /элвэн/ :triskell: I notice that I often have to deal with merge conflicts because they are handed of to me because the junior developers have some kind of negative emotional response to is while I just see it as a regular part any other programming work. 
 @e277f9e5 Makes me wonder how they deal with things like errors, specially ones that aren't from their language/framework but more like from their OS. 
 @Haelwenn /элвэн/ :triskell: I really don't know. You know have the kind of people who always just reinstall their OS or actually buy a new computer if something like that ever happens. 
 @e277f9e5 Ah yes, docker style software development: rm -fr && git clone 
 @Haelwenn /элвэн/ :triskell: I think this is also where the distro-hopping phenomenon comes from.

People use a distro for like a week until some generic easy to fix issue pops up and instead of spending 10 minutes of time to learn to solve it they "blame the tool" so to speak and install something else. 
 @e277f9e5 And the other side is like me being able to know that some problems are effectively stuck broken because they're part of the architecture.