00:39 <peepsalot> no idea why it needs a % match threshold at all... what is the point of git mv if internally it just counts everything as a file deletion and creation

00:40 <peepsalot> it seems to work if i reduce the threshold to 1% matching: git merge -Xfind-renames=1% origin master

00:41 <peepsalot> by "work" i mean, it stops falsely reporting any deletes. i still need to go through conflicts and see if any of it still makes sense with 1% matching

00:51 <peepsalot> teepee: do you think the threshold is based on count of lines changed, and not characters? so maybe the formatting + file restructuring makes files completely unmatchable?

00:54 <peepsalot> i don't get why it doesn't try to resolve file renames/deletions/creations **per commit**, like the commit that renamed things changed probably <1% of the file contents. but i guess its just taking the end results of all changes and saying "oh well no way to reconcile all that"?

00:56 <peepsalot> InPhase: your suggestion makes sense, but i'd much prefer if I could just tell git to not be completely braindead in determining deletes vs renames

01:48 <InPhase> peepsalot: Certainly. I've long considered the best thing about git to be that there doesn't seem to be anything better yet.

01:49 <InPhase> Aside from that, it's a bit of a mess. :)

01:49 <tcurdt> lol ... that sums git up perfectly :)

02:03 <peepsalot> InPhase: i was hoping there would be any kind of simple solution that doesn't require it's own tutorial for the 80 or so still open PRs we have :(

02:25 <InPhase> peepsalot: Well I was hopeful my suggestion would be formulaic and scriptable. But I don't know if it would actually work any better.

07:10 <peepsalot> another unfortunate issue with renamed files, no history on github: https://github.com/github/feedback/discussions/3272

08:38 <teepee> peepsalot: I'm not sure how it calculates that matching, I've never looked at details before

13:14 <J22> ok when do we get video import?  https://nvlabs.github.io/instant-ngp/

17:57 <gbruno> [github] AGZ-france opened issue #4190 (Submit modification from clone repository https://github.com/AGZ-france/openscad) https://github.com/openscad/openscad/issues/4190

21:46 <peepsalot> so, apparently the merge option i was looking for exists, but as a separate tool, which I already had installed previously and forgotten about:

21:46 <peepsalot> https://github.com/mhagger/git-imerge

21:47 <myosotis> why do I feel like that would cut my repo into pieces and put them all back together wrong?