-3
I’m working on a team of programmers who aren’t very familiar with Git. The question is:
We have an X file that is vital to the operation of the project. The problem is that in each branch we need to modify it. What would be the ideal solution not to cause any kind of conflict?
1
It depends on the file type. Binary files are not favorable to be used with summer control this way. Text files are easier to merge.
Now the question of conflict itself is inevitable. Git, like any other VCS tool, will only help you manage conflicts, but avoiding them is impossible, as you might notice in your own question. The real problem is more communication between the components of the project.
The best in these cases is to establish a file usage protocol. Something like an email or a team chat communication channel, so it’s easy to know who’s in possession at that moment, for example.
Browser other questions tagged git
You are not signed in. Login or sign up in order to post.
These links can help you! - Git // Programmer’s Dictionary - How to work as a team using github and gitbash
– Gabriel Monteiro
first it is interesting to know the tools of handling branchs. Know that conflicts are the most common thing in the world, Git will try to handle them alone, but often won’t be possible, especially if it’s a large project, requiring direct user interference
– yoyo