Zen and the Art of Merging Code
A team channel filled with messages all day. No one read them all. The senior developer was asked, “How do you keep up?” The senior replied, “I do not.” “Then how do you know what is happening?” “When something matters, someone tells me directly. When no one tells me directly, perhaps nothing matters.”
Two developers solved the same problem in different ways. Both worked. Both were elegant. A junior asked the senior, “Which one is correct?” The senior replied, “Both.” “Which one should we merge?” The senior said, “Now that is the real question.”
A junior asked the senior to look at their first commit. The senior looked, nodded, and said nothing. The junior asked, “Is it good?” The senior replied, “It is your first. That is all it needs to be.” Years later, the developer found that commit in the history and laughed at it. The senior was […]
The team estimated stories in points: one, two, three, five, eight. A junior asked, “What is a point?” The senior developer replied, “A point is what we agree it is.” “That seems arbitrary.” “It is. That is why it works. The moment we measure it precisely, we will be measuring the wrong thing.” Beyond the […]
After the outage, the team gathered to write a postmortem. Each engineer described what they had done and why. The senior developer said only, “We have explained how it happened. Now, what have we learned?” A long silence followed. The senior added, “If we cannot answer that, we have not finished.”
A developer created a feature branch and worked on it for six months. When they tried to merge, they found the main branch had become unrecognizable. The senior developer asked, “Were you working on the same codebase as your team?” “Yes.” “At the same time?” “…No.” The Teaching Unfolds That pause before the second answer […]
A junior added a cache to speed up the slow endpoint. The endpoint was fast. The data was wrong. The senior developer asked, “Did the cache work?” “It did exactly what I asked it to.” “And was that what you wanted?” The Code Behind the Koan Almost every caching incident starts with a correctly implemented […]
The status meeting ran long. Engineers spoke of progress, blockers, and dependencies. The senior developer was silent throughout. Afterward, a junior asked, “Why did you say nothing?” The senior replied, “I was waiting for the meeting to end so the work could begin.” “But the meeting was about the work.” “Yes. That is what I […]
A configuration file grew over the years to two thousand lines. A developer asked the senior, “Why are all of these settings here?” The senior answered, “Each one was once a question someone could not answer.” “And now?” “Now they are questions no one remembers asking.” Unpacking the Teaching Every line in that file started […]
A new senior joined the team. On their first day, they wrote nothing. A junior asked, “When will you start contributing?” The senior replied, “I have been contributing all morning.” “How?” “By not adding to what is already too much.” Beyond the Surface There is a quiet assumption in most engineering cultures that presence equals […]
