From: Philip Oakley Date: Tue, 14 May 2019 23:11:09 GMT Subject: Re: How to exchange rerere/redo resolutions? Message-ID: In-Reply-To: <87mujpwiod.fsf@evledraar.gmail.com> Hi Ævar, On 14/05/2019 09:21, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 14 2019, Philip Oakley wrote: > >> Hi All, >> >> On 10/05/2019 15:59, Philip Oakley wrote: >>>> You can publish your merged branch somewhere, and others can use >>>> contrib/rerere-train.sh to learn from the resolution. >>>> >>>> Supposedly, I've never actually used it... >> Does the contrib/rerere-train.sh actually work? I'm reading the code >> to ensure I understand what rerere/redo is doing, and in the training >> it tries to detect MERGE_RR via L87 >> >> if test -s "$GIT_DIR/MERGE_RR" >> >> It's not clear if that is an internal implementation detail, or a >> mistaken use of a historic path name. Can anyone enlighten me? > Historic? No, this is path.c now on master: Hmm, I'd now agree it's not a mistake, but the implementation detail is historic. I've now found [1,2,3,4] from before I knew of Git! And it's not mentioned in any of the documentation. > > path.c:1454:REPO_GIT_PATH_FUNC(merge_rr, "MERGE_RR") > > Internal, sure. We don't document it so it could change in theory, but > then we'd probably change rerere-train.sh along with it... Hopefully it'll be integrated into rerere/redo before that ;-), along with a bit more documentation on the capability for those who arrived late to the party. The use of this implementation detail came up yesterday in [5]. >>> The tricky part is when the patch series doesn't apply so the >>> conflict isn't yet on any branch.. >> When copying patches across to Git for Windows, the conflict >> resolution can be tricky. -- Philip [1] git-rerere: reuse recorded resolve, 29 Jan 2006, https://public-inbox.org/git/7v4q3no0v7.fsf@assigned-by-dhcp.cox.net/ [2] StGIT and rerere, 26 Oct 2006, https://public-inbox.org/git/7vfydbkn64.fsf@assigned-by-dhcp.cox.net/ [3] git-explain, 04 Dec 2006, https://public-inbox.org/git/7vwt57j94c.fsf_-_@assigned-by-dhcp.cox.net/ [4] Make git-rerere a builtin, 20 Dec 2006, https://public-inbox.org/git/Pine.LNX.4.63.0612201738000.19693@wbgn013.biozentrum.uni-wuerzburg.de/ [5] merge: add --quit, 14 May 2019 , https://public-inbox.org/git/nycvar.QRO.7.76.6.1905141540300.44@tvgsbejvaqbjf.bet/