pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 5 days agoCommitsh.itjust.worksimagemessage-square34fedilinkarrow-up1746arrow-down18 cross-posted to: [email protected]
arrow-up1738arrow-down1imageCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 5 days agomessage-square34fedilink cross-posted to: [email protected]
minus-squareLightfire228@pawb.sociallinkfedilinkarrow-up1arrow-down1·5 days agoI mean, you just need to look at the conflicting files, fix up the code, then stage those changes and pop a new commit There’s no “special” merge conflict resolution commit “type” As for fixing the code itself, I usually look at what changed between both versions, and then re-author the code such that both changes make “sense”
I mean, you just need to look at the conflicting files, fix up the code, then stage those changes and pop a new commit
There’s no “special” merge conflict resolution commit “type”
As for fixing the code itself, I usually look at what changed between both versions, and then re-author the code such that both changes make “sense”