Git ignore already modified files

I encounter a rare scenario that there is a file modified, but I don’t want to commit this change on git. There are many ways to do such as .gitignore file, but it doesn’t work when the file already tracks. The solution here is to manually ignore the file by entering this command: To start… Continue reading Git ignore already modified files

Resolve merge conflict for Unity Game Engine

I’m working in a group of 4 teammates for a unity 3D game project on the weekends. It’s pretty fun, but we have encounter problems with version control. Using Git and Github, there are many merge conflicts that it’s not easy to resolve, not simply delete a section or forced push: <<<<<<< HEAD:main.scenePainful=======Delete me>>>>>>> There… Continue reading Resolve merge conflict for Unity Game Engine