From: Raman Gupta Date: Tue, 25 Jul 2017 14:34:16 GMT Subject: [PATCH/RFC] contrib: rerere-train overwrites existing resolutions Message-ID: <1caa9bb1-9184-7335-a041-6abd2c8f616c@gmail.com> From 41116889f7eb2ddd590d165d9ca89646f7b15aaf Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Tue, 25 Jul 2017 10:28:35 -0400 Subject: [PATCH] contrib: rerere-train overwrites existing resolutions When running rerere-train, the user is explicitly asking the training to occur based on the current merge commit. However, if the current cache has a resolution for the same conflict (even if out of date or wrong), rerere-train does not currently update the rr-cache. Now, forget existing resolutions before training so that training is always reflective of the trained data. --- contrib/rerere-train.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh index 52ad9e4..a222d38 100755 --- a/contrib/rerere-train.sh +++ b/contrib/rerere-train.sh @@ -34,6 +34,7 @@ do # Cleanly merges continue fi + git rerere forget . if test -s "$GIT_DIR/MERGE_RR" then git show -s --pretty=format:"Learning from %h %s" "$commit" -- 2.9.4