Unity - How to merge development git branch that has a new fmod project with another sfx branch that has an old fmod project?

Unity
1

So I’m working on the development branch where I work on the code for the mechanics, and I just installed fmod on my branch and included the headers for the gitignore. There’s also another sfx branch that has some work done it in already.
How to merge them without conflicts, specially when fmod project location is different in each branch?
Thank you

2

Unfortunately, without knowing exactly what you’ve done on each machine, it’s impossible for us to know what conflicts will occur, and thus how to avoid them.