[Factor-builds] mason on macosx-x86-32: build loop error

[<fac...@gm...>]

Fatal error on shill.local

Process:
T{ process
    { command
        {
            "git"
            "pull"
            "git://factorcode.org/git/factor.git"
            "master"
        }
    }
    { environment H{ } }
    { environment-mode +append-environment+ }
    { stdin +closed+ }
    { stdout T{ fd { disposed t } { fd 19 } } }
    { stderr +stdout+ }
    { group +new-group+ }
    { timeout T{ duration { minute 30 } } }
    { status 1 }
    { pipe
        T{ pipe
            { in T{ fd { disposed t } { fd 18 } } }
            { out T{ fd { disposed t } { fd 19 } } }
        }
    }
}

Output:
From git://factorcode.org/git/factor
 * branch            master     -> FETCH_HEAD
Auto-merging basis/compiler/cfg/stacks/local/local.factor
CONFLICT (content): Merge conflict in basis/compiler/cfg/stacks/local/local.factor
Auto-merging basis/compiler/cfg/stacks/local/local-tests.factor
CONFLICT (content): Merge conflict in basis/compiler/cfg/stacks/local/local-tests.factor
Auto-merging basis/compiler/cfg/linearization/linearization.factor
CONFLICT (content): Merge conflict in basis/compiler/cfg/linearization/linearization.factor
Auto-merging basis/compiler/cfg/linearization/linearization-tests.factor
CONFLICT (content): Merge conflict in basis/compiler/cfg/linearization/linearization-tests.factor
Auto-merging basis/compiler/cfg/linear-scan/assignment/assignment-docs.factor
CONFLICT (content): Merge conflict in basis/compiler/cfg/linear-scan/assignment/assignment-docs.factor
Automatic merge failed; fix conflicts and then commit the result.

(U) Quotation: [ set-namestack init-catchstack self quot>> call -> stop ]
(O) Word: build-loop
(O) Word: update-sources
(O) Word: git-pull
(O) Word: try-output-process
(O) Word: output-process-error
(O) Method: M\ object throw
(U) Quotation: [
        OBJ-CURRENT-THREAD special-object error-thread set-global
        current-continuation -> error-continuation set-global
        [ original-error set-global ] [ rethrow ] bi
    ]