Initial implementation of minion skills

[dantswain]

See the updates to the README for the new usage.

The interaction could be nicer, but this does what's advertised. I want to revisit the interaction later, but would like to get this much merged and revisit that refinement as a separate PR.

[geowa4]

Conflicts.

[dantswain]

I have no idea why. Maybe because I merged master into the branch? A merge should still work fine....

[geowa4]

This branch cannot be rebased due to conflicts

[dantswain]

Thanks, that's very helpful. You're in devops, aren't you?

[dantswain]

medera - superpowers ❯ git merge upstream/master
Already up-to-date.

It just doesn't like the rebase option. A merge would succeed.

[dantswain]

@geowa4 There's no code conflicts. Can you please review the code and if you don't have any suggestions on how to get the rebase to work I'll just merge and push.

[geowa4]

I think if you git rebase master (assuming you have pulled the latest master), the error message will go away.

[dantswain]

I did a rebase and went through a bunch of crap to resolve it, then it wouldn't let me push without a merge, so I merged, and then pushed, and now I can't rebase again. Why can't we just do a merge?

[dantswain]

I ended up doing this:

git merge-base superpowers master
# outputs a sha
git reset --soft ${sha}
git commit
git push -f

[geowa4]

I did a rebase and went through a bunch of crap to resolve it, then it wouldn't let me push without a merge...

Without a merge to your feature branch? That makes sense. A rebase with another branch will change all your commits for that feature branch and require a force push.