Victor Leung

Tag: Git

  • Remove .DS_Store files in git

    —

    by

    Victor Leung
    in

    If you are a mac user and using git, you may accidentally commit a file with .DS_Store. Your windows colleague would be confused what does this files do and why do you commit it. First of all, what is .DS_Store file? DS stands for Desktop Services, which are used for mac to work out how to display…

  • Remove .DS_Store files in git

    —

    by

    Victor Leung
    in

    If you are a mac user and using git, you may accidentally commit a file with .DS_Store. Your windows colleague would be confused what does this files do and why do you commit it. First of all, what is .DS_Store file? DS stands for Desktop Services, which are used for mac to work out how…

  • Git ignore already modified files

    —

    by

    Victor Leung
    in

    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…

  • Resolve merge conflict for Unity Game Engine

    —

    by

    Victor Leung
    in

    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…