Merge conflict with github

[MJamil23]

Hello!
Im not a programmer by any means but im the sound designer in my school project and everytime I try to merge with main using GitHub, I get 2 conflicted files - usually these Assets\Plugins\FMOD\Cache\Editor\FMODStudioCache.asset and fmod_editor.log
in Unity, i get this error

what can i do to fix it?

[Connor_FMOD]

Hi,

If anyone is using a Mac on your team it may cause the pop-up:

Repair FMOD Libraries warning still keeps showing after click repair button

The issue is that git is replacing the line endings of the Mac libs from \n to \r\n. Clicking repair when this popup appears will switch them back to \n, but it looks like git is still clobbering the line endings every time you pull. Deleting them if you don’t need them is one option, otherwise if you add *.bundle text eol=lf to your .gitattributes file then the line endings of any .bundle files will remain as \n (line feeds).

Would it be possible to update your .gitignore? Both of these files FMODStudioCache.asset, fmod_editor.log should be ignored:

# Never ignore DLLs in the FMOD subfolder.
!/[Aa]ssets/Plugins/FMOD/**/lib/*

# Don't ignore images and gizmos used by FMOD in the Unity Editor.
!/[Aa]ssets/Gizmos/FMOD/*
!/[Aa]ssets/Editor Default Resources/FMOD/*

# Ignore the Cache folder since it is updated locally.
/[Aa]ssets/Plugins/FMOD/Cache/*

# Ignore bank files in the StreamingAssets folder.
/[Aa]ssets/StreamingAssets/**/*.bank
/[Aa]ssets/StreamingAssets/**/*.bank.meta

# If the source bank files are kept outside of the StreamingAssets folder then these can be ignored.
# Log files can be ignored.
fmod_editor.log

Let me know if the issue persists!