Re: [RFC/PATCH] stash: Delete MERGE_RR before stash apply

On Fri, Jul 6, 2012 at 4:01 PM, Junio C Hamano wrote: > Phil Hord writes: > >>> Would an obvious alternative of running "git rerere" ourselves after >>> running "git merge-recursive" in this script work? >>> >>> git-stash.sh | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/git-stas

Re: [RFC/PATCH] stash: Delete MERGE_RR before stash apply

Phil Hord writes: >> Would an obvious alternative of running "git rerere" ourselves after >> running "git merge-recursive" in this script work? >> >> git-stash.sh | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/git-stash.sh b/git-stash.sh >> index 4e2c7f8..bbefdf6 100755 >> --- a/git

Re: [RFC/PATCH] stash: Delete MERGE_RR before stash apply

On Thu, Jul 5, 2012 at 1:15 PM, Junio C Hamano wrote: > Phil Hord writes: > >> The presence of a GIT_DIR/MERGE_RR file indicates we >> were resolving a merge which had rerere candidates for >> recording. But the file does not get deleted after >> all resolutions are completed. This is ok for mo