adambkaplan, 7 months ago @b0rk when dealing with merge conflicts, I always confuse “Current change” and “Incoming change.” I often pull up the “clean” code on GitHub to figure out which lines are “mine” that I want to keep.
@b0rk when dealing with merge conflicts, I always confuse “Current change” and “Incoming change.” I often pull up the “clean” code on GitHub to figure out which lines are “mine” that I want to keep.