Including "code is delivered in a way that involves merges"

This feels like a "is a hotdog a sandwich?" situation.

"Is sftp-ing to prod a merge?"

My team follows good practice but I deal with a vendor who emails us a ZIP file :scream:

Honestly it's kind of refreshing to just push files to a server.

I've been telling people for years, if the process to deploy to an environment is more complicated than one click, it's too complicated!