Looking great on camera while working from home requires good lighting. Working at Doximity, a company that has been remote-first since long before the pandemic, necessitates a fair number of video calls as we collaborate and work on challenging problems together. Though meetings constitute only a fraction of my time, I appreciate having some good lighting during those calls. I also appreciate…
As software engineers, we generally have a strong desire to write clean, maintainable code. We want changes to take as long as they seem they intuitively should, not get hung up in a hard-to-understand mess. We want to write code that will be a pleasure rather than a pain for us and others to work with later. To this end, we attempt to use good software design principles such as SOLID . Dependency…
+1 for telling me about diff3 alone—how often I was looking on an incomprehensible conflict, cursing whoever is responsible for not telling me what the common ancestor had to say. Thank you very much. Well said, John of StackOverflow. The diff3 conflict resolution strategy is a hidden gem in git that has saved me uncountable conflict-resolution headaches and has turned git conflict resolution into…
As one who uses git’s diff3 style conflict markers, I have actually come to enjoy performing git conflict resolution. Using diff3 makes conflicts significantly easier to reason about. There’s an edge case, however, that is not so understandable. You may encounter something like this: <<<<<<< HEAD aaaaaa ||||||| merged common ancestors <<<<<<< Temporary merge branch 1 bbbbbb ======= cccccc >>>>>>>…