A skill with a five-step process for resolving git merge and rebase conflicts.
dsh plugin --profile web add dsh-merge-conflicts
View the source on GitHub