Repository navigation
Commit e4f909c
committed
fix(server): a lone "=======" line no longer blocks finishing a merge
git diff --check reports a standalone "=======" as a leftover conflict
marker, so a resolved file with a reStructuredText heading underline was
refused. Treat a file as still conflicted only when its reported marker
lines include both an opening "<" and a closing ">" boundary.
AI-assisted; verified with the tests and tools listed above.1 parent 6d66290 commit e4f909c
2 files changed
Lines changed: 42 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6407 | 6407 | | |
6408 | 6408 | | |
6409 | 6409 | | |
6410 | | - | |
| 6410 | + | |
| 6411 | + | |
| 6412 | + | |
6411 | 6413 | | |
6412 | 6414 | | |
6413 | 6415 | | |
| |||
6418 | 6420 | | |
6419 | 6421 | | |
6420 | 6422 | | |
6421 | | - | |
| 6423 | + | |
| 6424 | + | |
| 6425 | + | |
| 6426 | + | |
6422 | 6427 | | |
6423 | 6428 | | |
6424 | 6429 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2555 | 2555 | | |
2556 | 2556 | | |
2557 | 2557 | | |
2558 | | - | |
2559 | | - | |
2560 | | - | |
2561 | | - | |
2562 | | - | |
2563 | | - | |
| 2558 | + | |
| 2559 | + | |
| 2560 | + | |
| 2561 | + | |
| 2562 | + | |
| 2563 | + | |
| 2564 | + | |
| 2565 | + | |
| 2566 | + | |
| 2567 | + | |
| 2568 | + | |
2564 | 2569 | | |
| 2570 | + | |
| 2571 | + | |
| 2572 | + | |
| 2573 | + | |
| 2574 | + | |
| 2575 | + | |
| 2576 | + | |
| 2577 | + | |
| 2578 | + | |
| 2579 | + | |
| 2580 | + | |
| 2581 | + | |
| 2582 | + | |
| 2583 | + | |
| 2584 | + | |
| 2585 | + | |
| 2586 | + | |
| 2587 | + | |
| 2588 | + | |
| 2589 | + | |
| 2590 | + | |
| 2591 | + | |
| 2592 | + | |
2565 | 2593 | | |
2566 | 2594 | | |
2567 | 2595 | | |
2568 | 2596 | | |
2569 | | - | |
2570 | | - | |
2571 | | - | |
| 2597 | + | |
2572 | 2598 | | |
2573 | 2599 | | |
2574 | 2600 | | |
| |||
0 commit comments