How often should you push to the server?

Question

git

We work together: 2 fronts and one back, how often it is best to make commits.
Everyone is yelling vehemently that once a day is enough. But then there will be no conflicts.

Answer 1

It really depends on your process and on the connectedness of your tasks and nothing more)

Answer 2

As a new feature is made, then push.

Answer 3

There are two branches. Master and Dev.
The master stores the production. In maiden test.
The tasks that you perform are kept in some kind of accounting system. Each task has a number.
Being in Virgo, you choose a task. make a branch dev_%task_id%, for example, dev_3151
Execute the task. send to the server. take a new task and figure out the next task.
occasionally. as it is more convenient for you and how critical it is for you (for example, some tasks cannot be completed while some task is not yet merged), the lead checks and merges the branches in dev. everyone renews themselves and is happy.
when you're ready, merge master with dev

Answer 4

Commits can be done at least for every sneeze. Although it would be more logical to commit something finished.
Regarding pushing the code... in general, there is such an opinion that it is ideal when all developers have the same code at least once a day. May not be a worker. That is, you have master for stable code and dev for development. Between them, you can still screw staging. And then two options - feature-branch or feature-switch. The downside of the first one is that changes should not break the project before they get into the dev branch. In the second approach, you wrap each feature in a check whether this feature is enabled or not. Well, who needs it - he turns it on, etc. The advantage of this approach is that everyone in the team has the same codebase.
And what exactly to choose is up to you. I can only say that for good there should be no conflicts in your situation at all, since you do not climb into templates and they do not climb into the code. Well, let them settle among themselves so as not to edit the same lines in the files. Yes, and conflicts are not so difficult to resolve.

Answer 5

To health - habrahabr.ru/post/106912 .