Problem: If you move files via cut and paste, Git “sees” a remove and an add
Problem: If you move files via cut and paste, Git “sees” a remove and an add. This creates merge conflicts and breaks file commit history.
Solution: Move files via “git mv”.
This assures Git “sees” the move. Commit history is retained and merge conflicts are avoided.
Editors like VS Code also support drag and drop. So, if I drag files, it does a git mv for me.
Handy.