The merge conflict can also be avoided by combining the bathroom changes with its creation and adding the pantry separately.
But some conflicts are unavoidable. Knowing what is changing is the challenging part of a merge conflict. I wish tools were better at showing the commit tree of both files not just the files. As it stands I open two gitk windows to follow along.
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.