Hi Philip,, This is an area of interest to me, any headway on this? I would suggest some extra output be added about *why* files conflict when "git-merge" is run with -v
In the past I noticed not much difference between "-q, [nooption], and -v" in the output. -- Quentin On Sunday, May 17, 2015 at 6:47:22 PM UTC-5, Dale R. Worley wrote: > > "Philip Oakley" <philip...@iee.org <javascript:>> writes: > > I think in this case the byte by byte check was identical,including line > > endings, which made it all the more awkward to sort out. (detecting file > > mode changes!) > > Oh, that's interesting. Internally, it means that the recorded hash for > files matches between versions, but the recorded hash for the > directories won't be (because the files' modes are stored in the > directory object, not the file object). > > Dale > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
