How to fix /Library/ conflicts in GitHub repo for Unity project?

Question

We got it so that the Unity Project folder doubles as our git repo. We made the git repo and forgot to get the .gitignore file in there. Now /library/ conflicts are preventing anyone from working with the repo, even after we created the .gitignore file in the master. We aren't sure how to fix this without losing a lot of work and starting over in GitHub.

Our repo is at the following link: https://github.com/warpaltarpers/IMS487

Please help us on this one, as we can't move forward without fixing this, and we would rather not delete the repo to start over with version control.

Answer 1

Best Answer

Answer by Bonfire-Boy · Oct 29, 2017 at 12:43 AM

IMO you need to remove the Library folder from the repository. Adding an entry to gitignore doesn't stop it tracking files that it's already tracking.

This should help... https://stackoverflow.com/questions/6313126/how-to-remove-a-directory-from-git-repository

Having removed the folder from tracking, people should be able to delete their local Library folders and have Unity regenerate them without impacting on each other.

Add comment · Show 1 · Share

Paapankamwa · Oct 29, 2017 at 01:35 AM 0

Share

Thank you! I appreciate the help on this!

How to fix /Library/ conflicts in GitHub repo for Unity project?

1 Reply

Your answer

Welcome to Unity Answers

Follow this Question

Related Questions