minus-squareLemoineFairclough@sh.itjust.workstoProgrammer Humor@lemmy.ml•CommitlinkfedilinkEnglisharrow-up6·1 day agoDoesn’t git status tell you what to do? use “git add <file>…” to mark resolution use “git commit” to conclude merge I always use git status to check what is appropriate before doing anything else, since the right thing to do can sometimes be different, like after using git rebase when a break command was used vs when a squash command resulted in a conflict. linkfedilink
Doesn’t
git statustell you what to do?I always use
git statusto check what is appropriate before doing anything else, since the right thing to do can sometimes be different, like after usinggit rebasewhen abreakcommand was used vs when asquashcommand resulted in a conflict.