Conditions prohibiting a regular merge: BLOCKED, BEHIND, DIRTY. Conditions triggering a regular merge even if `--auto` was set: CLEAN, HAS_HOOKS. Note that UNKNOWN status does not trigger either of the conditions. |
||
|---|---|---|
| .. | ||
| http.go | ||
| merge.go | ||
| merge_test.go | ||