Git Conflicts

When you push your changes or pull external changes, you can get some conflicts with the main repository. For example, another user modified the same files with other changes.  You need to resolve it before you can push it again. This could be one of the most difficult parts of the version management, but it could be avoided if you are constantly pulling the remote updated changes in your local working.