Heath Borders on Nostr: npub1upkp7…4tcwy typo: s/When you do a merge, HEAD in the merge conflict is the ...
npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) typo:
s/When you do a merge, HEAD in the merge conflict is the same as what HEAD when you ran git merge. Simple./When you do a merge, HEAD in the merge conflict is the same as what HEAD _was_ when you ran git merge. Simple./
s/When you do a merge, HEAD in the merge conflict is the same as what HEAD when you ran git merge. Simple./When you do a merge, HEAD in the merge conflict is the same as what HEAD _was_ when you ran git merge. Simple./