We develop some game with my friend and sharing code and scenes with GitHub. Everything was fine but after one commit (where I add some new working script and deleted some trash from project) he has a conflict with this dwlt file (as in screenshot 1), but I have everything okay (as in screenshot 2). Project with changes working fine but we have strange conflict here. Can anybody help plz?

CodePudding user response：

You have the same user case illustrated in this Unity thread with:

• putting [Uu]ser[Ss]ettings/ in .gitignore
• git rm --cached -r UserSettings/

That will only remove that folder content from the most recent commit.