fix updating conflicts

Signed-off-by: l.feng <[email protected]>

Author: msclock

.github/workflows/cd.yml

@@ -33,11 +33,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -54,11 +50,7 @@ jobs:
           ccache: true
           doxygen: true
 
-<<<<<<< before updating
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-=======
       - uses: actions/setup-python@v5
->>>>>>> after updating
         with:
           python-version: 3.x
 

.github/workflows/ci.yml

@@ -24,11 +24,7 @@ jobs:
         with:
           fetch-depth: 0
 
-<<<<<<< before updating
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-=======
       - uses: actions/setup-python@v5
->>>>>>> after updating
         with:
           python-version: 3.11
 
@@ -56,11 +52,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -137,11 +129,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -219,11 +207,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -288,11 +272,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -309,11 +289,7 @@ jobs:
           ninja: true
           ccache: true
 
-<<<<<<< before updating
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-=======
       - uses: actions/setup-python@v5
->>>>>>> after updating
         with:
           python-version: 3.x
 
@@ -364,11 +340,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -415,11 +387,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -465,11 +433,7 @@ jobs:
 
       - name: Upload test results
         if: failure()
-<<<<<<< before updating
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-=======
         uses: actions/upload-artifact@v4
->>>>>>> after updating
         with:
           name: valgrind-results
           path: out/valgrind-results.tar.gz
@@ -484,11 +448,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -503,11 +463,7 @@ jobs:
           ninja: true
           ccache: true
 
-<<<<<<< before updating
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-=======
       - uses: actions/setup-python@v5
->>>>>>> after updating
         with:
           python-version: 3.x
 
@@ -540,11 +496,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -559,11 +511,7 @@ jobs:
           ninja: true
           ccache: true
 
-<<<<<<< before updating
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-=======
       - uses: actions/setup-python@v5
->>>>>>> after updating
         with:
           python-version: 3.x
 
@@ -596,11 +544,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -618,11 +562,7 @@ jobs:
           doxygen: true
           graphviz: true
 
-<<<<<<< before updating
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-=======
       - uses: actions/setup-python@v5
->>>>>>> after updating
         with:
           python-version: 3.x
 
@@ -649,11 +589,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -692,11 +628,7 @@ jobs:
         run: cmake --build --preset=default --target ccov-all
 
       - name: Upload coverage report
-<<<<<<< before updating
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
-=======
         uses: codecov/[email protected]
->>>>>>> after updating
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

.github/workflows/codeql.yml

@@ -50,21 +50,13 @@ jobs:
           fetch-depth: 0
 
       - name: Initialize CodeQL
-<<<<<<< before updating
-        uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
-=======
         uses: github/codeql-action/init@v3
->>>>>>> after updating
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Cache
-<<<<<<< before updating
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
-=======
         uses: actions/cache@v4
->>>>>>> after updating
         with:
           path: |
             ~/vcpkg
@@ -95,8 +87,4 @@ jobs:
         run: cmake --build --preset=default --target all
 
       - name: Perform CodeQL Analysis
-<<<<<<< before updating
-        uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
-=======
         uses: github/codeql-action/analyze@v3
->>>>>>> after updating

vcpkg.json

@@ -2,11 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "cppfront-practice",
   "description": "Practice based on cppfront",
-<<<<<<< before updating
-  "builtin-baseline": "984f9232b2fe0eb94f5e9f161d6c632c581fff0c",
-=======
   "builtin-baseline": "41c447cc210dc39aa85d4a5f58b4a1b9e573b3dc",
->>>>>>> after updating
   "homepage": "https://github.com/msclock/cppfront-practice",
   "dependencies": [
     "cppfront",
@@ -48,11 +44,7 @@
     "registries": [
       {
         "kind": "git",
-<<<<<<< before updating
-        "baseline": "5909aec4d2a472ab4c734832c7391926bce7ce18",
-=======
         "baseline": "72847990e168d014e2918e26218e4ae492f5b569",
->>>>>>> after updating
         "repository": "https://github.com/msclock/cmake-registry",
         "packages": [
           "cmake-modules",