Hello. Site development is underway, there are several people involved in this, each on their own localhost. Created repository on GitLab. The problem is that the site is actively working with files, and you need to take changes from the site before making your changes. How can we organize the work, in what order and can it be somehow simplified? Something completely confused ...

  • one
    Apparently, you need to separate your files and server files. Otherwise you will get confused - KoVadim
  • how to do it? Add to Ignore is not an option, because people can work with system files, and these files can be changed from the admin site (they store settings, templates depending on parameters, etc.), that is, it can be overwritten by everyone - ShutTap
  • as i would do Separately, the site files are located separately and files that can change with admin. If now, you need to take a config for example, then first we load one, and then on top of the other. - KoVadim

0