diff --git a/.github/workflows/sync-master-to-maetro.yaml b/.github/workflows/sync-master-to-maetro.yaml index 0adcdb257d..e86d59ab1f 100644 --- a/.github/workflows/sync-master-to-maetro.yaml +++ b/.github/workflows/sync-master-to-maetro.yaml @@ -36,6 +36,10 @@ jobs: git checkout --ours -- "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll" git add --verbose "Shared/data/MTA San Andreas/MTA/d3dcompiler_47.dll" + # Discard cefweb conflicts + git checkout --ours -- Client/cefweb/CWebView.cpp + git add --verbose Client/cefweb/CWebView.cpp + git checkout --ours -- "Client/loader/MainFunctions.cpp" git add --verbose "Client/loader/MainFunctions.cpp"