search

cloudflavor / oscar

A GitOps automation bot for VCS misc tasks
Apache License 2.0
0 stars 0 forks source link

Don't merge if there are conflicts #32

Closed PI-Victor closed 6 days ago

PI-Victor commented 1 week ago

Context

Currently /merge force will merge even with conflicts.

Description

There's no reason or edge case where a merge with conflicts should ever occur

Acceptance Criteria

the bot refuses to merge PRs with conflicts.

linear[bot] commented 1 week ago

CLO-49 Don't merge if there are conflicts

PI-Victor commented 1 week ago

/assign /triage