git status contains zillions changes

[clemens-tolboom]

Looks like lots of files are reimported. Do you have similar git status results? I thought we could ignore all .import but #7 ignore example shows none.

git status
On branch 4.x
Your branch is up to date with 'origin/4.x'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
    modified:   game/assets/1K-dirt_5.png.import
    modified:   game/assets/851H-kktt.ttf.import
    modified:   game/assets/DSEG7ClassicMini-Bold.ttf.import
    modified:   game/assets/GSDRailing8_Diffuse.png.import
...
    modified:   game/old/skysphere2.dae.import
    modified:   game/project.godot
    modified:   game/vulkan sky/textures/noise.png.import

Untracked files:
  (use "git add <file>..." to include in what will be committed)
    game/.godot/
    game/assets/WoodBamboo.jpg.import
    game/assets/circle_05.png.import
    game/assets/driver/racedriver2_Material.png
    game/assets/driver/racedriver2_Material.png.import
    game/assets/driver/racedriver2_Material_1.png
    game/assets/driver/racedriver2_Material_1.png.import
    game/assets/driver/racedriver2_Material_2.png
    game/assets/driver/racedriver2_Material_2.png.import

no changes added to commit (use "git add" and/or "git commit -a")

[clemens-tolboom]

Using

find game/*/ -name "*.import" -exec git checkout -- {} \;

left

git status
On branch 4.x
Your branch is up to date with 'origin/4.x'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   game/assets/car/car_mirror.tres
        modified:   game/assets/car/car_side_gradient.tres
        modified:   game/assets/car/car_wheel_shader.tres
        modified:   game/assets/road_shadermat.tres
        modified:   game/assets/shadermaterial_glass.tres
        modified:   game/assets/shadermaterial_glass_rain.tres
        modified:   game/hud/AI steering vis.gd
        modified:   game/hud/main_menu.tscn
        modified:   game/icon.png.import
        modified:   game/map_edited.png.import
        modified:   game/project.godot

and untracked

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        game/.godot/
        game/assets/WoodBamboo.jpg.import
        game/assets/circle_05.png.import
        game/assets/driver/racedriver2_Material.png
        game/assets/driver/racedriver2_Material.png.import
        game/assets/driver/racedriver2_Material_1.png
        game/assets/driver/racedriver2_Material_1.png.import
        game/assets/driver/racedriver2_Material_2.png
        game/assets/driver/racedriver2_Material_2.png.import

[clemens-tolboom]

Cleanup .tres

find game/*/ -name "*.tres" -exec git checkout -- {} \;

From the remaining untracked I guess racedriver2_ is from v3.x

git clean -fd game/assets/
git reset origin --hard

[clemens-tolboom]

removing the game/.godot then importing gave me

[clemens-tolboom]

I go back to my own project(s) for a week or two. CY

[Zireael07]

I was never sure whether to put *.import in Git or not. Looks like I missed some, I will have to fix this.