Closed jdngray77 closed 3 years ago
Didn't mean to do that :/
I was trying forward port maint/gitignore/wwise
by rewriting it with the correctly based branch, but i was checked out to develop.
So i've accidentally overwritten develop
with the maintenance branch. I'll verify the history see about rolling it back.
Edit: Fixed with no dramatic consequences! Phew.
@atallahhezbor The first, I left them in under the assumption they should exist, but changes are constant, irrelevant, and conflicting
Wwise meta files persist in changeless with constant alterations unique to workstations.
If this continues, we'll likely run into multitudes of conflicts revolving these files.
Originally they we're included since the Unity guideline is to include all meta files, however it's become clear that wwise will forever modify these files, which will lead to merging issues later on.
Adds: