fix: gix merge file
now uses THEIRS
instead of OURS
where needed (#1703)
#1704
Annotations
2 errors
Scan for dependencies that build C or C++ code
Process completed with exit code 1.
|
Show logged C and C++ compilations (should be none)
Process completed with exit code 1.
|
Loading