{"push_id":1017398760,"size":1,"distinct_size":0,"ref":"refs/heads/jc/rerere-multi","head":"40dcb75c70b0ec7322544c3fde8fbc882240056f","before":"ef63b91b59c2ffd67d8d8d2119471bc798e1a388","commits":[{"sha":"40dcb75c70b0ec7322544c3fde8fbc882240056f","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"rerere: split code to call ll_merge() further\n\nThe merge() helper function is given an existing rerere ID (i.e. the\nname of the .git/rr-cache/* subdirectory, and the variant number)\nthat identifies one <preimage, postimage> pair, try to see if the\nconflicted state in the given path can be resolved by using the pair,\nand if this succeeds, then update the conflicted path with the\nresult in the working tree.\n\nTo implement rerere_forget() in the multiple variant world, we'd\nneed a helper to do the \"see if a <preimage, postimage> pair cleanly\nresolves a conflicted state we have in-core\" part, without actually\ntouching any file in the working tree, in order to identify which\nvariant(s) to remove.  Split the logic to do so into a separate\nhelper function try_merge() out of merge().\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/gitster/git/commits/40dcb75c70b0ec7322544c3fde8fbc882240056f"}]}