Git import: a merge where two histories added the same file imports as a conflict issue #71 closed: completed andymccall opened this 1 month ago · 0 comments

Found by verifying VS Code's 28 637-commit reproducer (2026-10-05). From merge c67ef57cda90 ("Merge pull request #13373 from Microsoft/joh/fmt") on, oxy git verify finds 653 differences: whole files (build/gulpfile.hygiene.js and others) render as two-sided conflicts, between the merge's own change and 23db8835f58f ("Merge branch 'Microsoft/master' into update-css-intellisense", one parent, which adds the file whole while main had built it up through its own commits). 23db8835 is a Git ancestor of c67ef57 through both parents, yet the imported change does not resolve the duplicate. The import before and after the memory budget of issue #25 fails identically, so it is not new. Git merges identical additions cleanly; Oxygen's import must record the resolution at the first merge where the two histories meet. Reproducer: slice-c67ef57 on Earth (~/bench/vscode.git).