This browser is no longer supported.
Upgrade to Microsoft Edge to take advantage of the latest features, security updates, and technical support.
Hello!
Can a team or group of developers work on the same project without any conflict between them in the changes made by each of them...?
A family of Microsoft suites of integrated development tools for building applications for Windows, the web, mobile devices and many other platforms. Miscellaneous topics that do not fit into specific categories.
![](data:image/svg+xml, %3Csvg xmlns='http://www.w3.org/2000/svg' height='64' class='font-weight-bold' style='font: 600 30.11764705882353px "SegoeUI", Arial' width='64'%3E%3Ccircle fill='hsl(140.8, 78%, 23%)' cx='32' cy='32' r='32' /%3E%3Ctext x='50%25' y='55%25' dominant-baseline='middle' text-anchor='middle' fill='%23FFF' %3ETS%3C/text%3E%3C/svg%3E)
Hello @Leila KHAMMASSI ,
Yes, you can.
Conflicts can occur during a merge if two developers modify the same lines in a file and Git doesn’t automatically know which one is correct. Git halts the merge and informs you that you are in a conflicted state. Learn more in the Resolve merge conflicts page.
Resolve merge conflicts in Visual Studio
Regards,
Tianyu
Hello!Thank you for your cooperation, the link you sent is important
Answer accepted by question author
Yes I use git with multiple developers working on project at work and some of the open source projects I work on. If there is a conflict in a file visual studio will allow you to fix the conflict in the code file.
Bonjour!
Thank you very much for your effective cooperation and for your clear answer