The way to “reinit” repository

Question

I\'ve made kind of a big refactoring in my project: I renamed files, removed, added... Besides, I added some folders in .gitignore. However, I\'ve already made a commit to a

Answer 1

The lazy way is to just add all the new files and changes, and deletions:

git add -A .

So long as you don't have any conflicts, this should merge in fine.