Imagine a castle made of git!
Wait a second.
That's not the sentence I wanted to start with. Anyway.
The problem
If you have ever work...
For further actions, you may consider blocking this person and/or reporting abuse
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.
I'm just gonna plan on reading this as many times as I can today so that I might remember it in the future and stop making 'fixed the fix' commits
Thanks! :D I hope it could help!