fix: USE THEIRS for AU conflict and USE MINE for UA conflict
#2968
love-lingerci.yml
on: push
Matrix: Build / build
Prepare version string
3s
Matrix: Package / Package Linux
Matrix: Package / Package macOS
Matrix: Package / Package Windows
Artifacts
Produced during runtime
| Name | Size | Digest | |
|---|---|---|---|
|
package.linux-arm64
Expired
|
64.3 MB |
sha256:52ada9f3b7179e524c7b285570543a156966d03c1c69e259edcda1a633d6e6da
|
|
|
package.linux-x64
Expired
|
67.9 MB |
sha256:a6a22182a5d6eb2ceb45f26f3de8499bcc8ce6c6f607f7c323ecbed97b7191ca
|
|
|
package.osx-arm64
Expired
|
25.5 MB |
sha256:2f9e603f6ea2c65b88b8388df7512c9b19ee43af27cde03d66e06dcfe8de1610
|
|
|
package.osx-x64
Expired
|
26.2 MB |
sha256:f895cf61f730f8ffdaad8f0ff5049c312daa792b5b051abbfc01ea08d8ec604d
|
|
|
package.win-arm64
Expired
|
21.5 MB |
sha256:c195eb50021dd618709a27edd7ad5f8e13bf1e854bae6e8202484ddfafda2bae
|
|
|
package.win-x64
Expired
|
22.6 MB |
sha256:ad43051e3354499eb111820665cba0cc44c8a46a45c9029949ddb25d6e759a77
|
|