How would you set up a sensible Azure CI/CD pipeline?

Start with a small pipeline that builds the app and runs its checks on every change. Then make deployment a separate stage, so a failed build never reaches an environment. Add stages for the environments you actually use, such as development, test, staging, and production, rather than creating extra steps just because a template has them.

For production, an approval gate can be useful when someone needs to review the change or coordinate a release. Keep the path to a quick rollback clear too. Not every change needs a fully automated production release, especially while the process is new.

I would choose GitHub Actions or Azure DevOps based on what your team already uses and where you want the workflow to live. Both can handle YAML pipelines and staged deployments. Switching tools just to use the one that seems more fashionable adds work without automatically making releases safer.

Whichever you pick, keep the pipeline readable. Use clear stage names, make the build and deployment steps easy to tell apart, and avoid copying the same configuration into several places if it can be shared sensibly.

Pick the deployment style based on how much risk the release can tolerate. A rolling deployment can be straightforward, while blue-green or canary approaches give you ways to limit or redirect exposure during a rollout. They also add setup and operational complexity, so they are not automatically the best choice for every app.

Before relying on any strategy, decide what would trigger a rollback and make sure the rollback process is understood. A deployment plan that names a strategy but has no clear recovery step is only half a plan.

Spend time on the boring bits early: keep credentials out of the YAML itself, use narrowly scoped deployment identities, and pin versions of the actions your workflow depends on. Those small controls make the pipeline easier to trust later.

For merge conflicts, the best prevention is usually keeping branches and changes manageable and resolving conflicts before they pile up. If a conflict does happen, read both sides and check the resulting file, rather than treating the conflict markers as something to delete blindly.