search

puppetlabs / puppetserver-ca-cli

A simple Ruby CLI tool to interact with the Puppet Server's included Certificate Authority
Apache License 2.0
3 stars 24 forks source link

(SERVER-2740) Implement the 'prune' action for Puppetserver's CA CLI #84

Closed Tu2607 closed 3 years ago

mwaggett commented 3 years ago

something looks a little funky to me.. why are there two "Implement action 'prune'" commits, but no merge commit?

Magisus commented 3 years ago

In general, you shouldn't edit the pre-generated merge commit title. We prefer to leave it as git writes it, so we can clearly see what's a merge.

Tu2607 commented 3 years ago

something looks a little funky to me.. why are there two "Implement action 'prune'" commits, but no merge commit?

I might have goofed. Fixed the merge conflict with the version and did git commit -m "(SERVER-2740)...". Of course this is after doing git merge --log --no-ff 1.x

mwaggett commented 3 years ago

ahh, you should be able to just to git commit after resolving conflicts and that will populate the message with the default merge commit message.

Tu2607 commented 3 years ago

Sorry, habit of tagging thing lately. I'll amend that.