Hi Junio, On Fri, 18 Jan 2019, Junio C Hamano wrote:
> Johannes Schindelin <[email protected]> writes: > > >> Overall, this was quite a pleasant read and a well constructed > >> series. Other than two minor points (i.e. interaction with the > >> 'post-checkout hook' topic, and discard_cache() before calling > >> move_to_original_branch) I did not quite understand, looks good to > >> me. > >> > >> When merged to 'pu', I seem to be getting failure from t3425.5, .8 > >> and .11, by the way. I haven't dug into the actual breakages any > >> further than that. > > > > Sorry for the trouble, and for my silence (I was heads-down into the Azure > > Pipelines support). > > > > I did not see any breakage in `pu` lately, hopefully things resolved > > themselves? > > The (semantic) conflict resolution can be seen in > > $ git show 'origin/pu^{/^Merge branch .js/rebase-am. into}' > > which is recorded in my rerere database ;-) That looks all good to me, with the minor nit that you did not wrap at <= 80 columns/row: - "--no-cover-letter", "--pretty=mboxrd", NULL); ++ "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL); I am not a stickler to this line length rule, though, as I long switched away from the 80x25 screen and can easily resize my text windows. Ciao, Dscho
