# HG changeset patch # User jbe # Date 1448932240 -3600 # Node ID e80c8790a1ca0cd5229c3b390293a809937c848c # Parent af42478acf74593e58644af36515415e67d26209 Use -f switch for git-checkout in lf4rcs example config diff -r af42478acf74 -r e80c8790a1ca config/example.lua --- a/config/example.lua Tue Dec 01 02:10:04 2015 +0100 +++ b/config/example.lua Tue Dec 01 02:10:40 2015 +0100 @@ -290,8 +290,7 @@ commit = function(path, exec, branch, target_node_id, close_message, merge_message) if merge_message then - -- TODO reset on error - exec("git", "-C", path, "checkout", "master") + exec("git", "-C", path, "checkout", "-f", "master") exec("git", "-C", path, "merge", target_node_id, "-m", merge_message) exec("git", "-C", path, "push", "origin", "master") end