Repository navigation
Implement #280 for fewer spurious merge conflicts in Dafny backend - #296
Conversation
|
@Sequela02 -- do you have a better idea how to go about this? I find this PR a bit messy. I think even the test could be cleaner. Maybe overall it works well enough? Would appreciate a second opinion. Thanks. |
|
The approach looks right to me. The fixture conflicts on Most of the mess comes from const merge = (flags: string[]) => execFileSync("git", ["merge-file", "-p", ...flags, "--", dfyPath, basePath, genPath],
{ stdio: ["ignore", "pipe", "pipe"], maxBuffer: Infinity });Exit 0 writes the output to the The arguments are fixed, so exit 129 can only mean that Git rejected the option. Checking the status is enough, without For the tests, a small I tried this locally. On Git 2.43 the regen tests pass, with the large-proof test skipped as designed, and the new tests fail on Two smaller things. The large-proof test skips without a word on Git before 2.44, so it could fail instead when None of this is a bug in your version. These are code-quality changes. If they sound better to you, I can open a PR against |
|
Separately from my comment above, and unrelated to this PR: the additions-only check runs |
|
Thanks for the review! Yes, please open a PR. I'd like the clean change in one merge. |
No description provided.