Improving diff3 conflict quality -- reducing the prevalence of nested conflicts with recursive merges #22409
Annotations
6 errors
|
print test failures
Process completed with exit code 2.
|
|
Run ci/run-build-and-tests.sh
failed: t6416.6 git detects differently handled merges conflict
|
|
Run ci/run-build-and-tests.sh
failed: t6416.7 git detects differently handled merges conflict, swapped
|
|
Run ci/run-build-and-tests.sh
failed: t6416.38 check nested merges without nested conflicts
|
|
Run ci/run-build-and-tests.sh
failed: t6416.40 check virtual merge base where multiple levels back had conflicts
|
|
Run ci/run-build-and-tests.sh
Process completed with exit code 1.
|
Loading