When resolving a conflict, how do you distinguish the different commits?
I just read the code, use context clues, and sometimes check the commit explicitly if I’m not sure, but it’s slow. I agree with Julia that HEAD is… confusing in this context.
When resolving a conflict, how do you distinguish the different commits?
I just read the code, use context clues, and sometimes check the commit explicitly if I’m not sure, but it’s slow. I agree with Julia that HEAD is… confusing in this context.