Skip to content

Env Name

Jump to bottom
Josh Soref edited this page Jan 21, 2022 · 2 revisions

Currently it uses MERGE_FAILED

Consider using MERGE_CONFLICT to indicate conflicts as opposed to git failing in some unexpected manner.

Clone this wiki locally