• Community
  • Interests
  • Git
  • Questions
  • Avec GIT, comment gérer les conflits sur les projets où plusieurs développeurs travaillent sur les mêmes fichiers?

Avec GIT, comment gérer les conflits sur les projets où plusieurs développeurs travaillent sur les mêmes fichiers?

Avec GIT, quelle est la bonne formule pour les projets où plusieurs développeurs travaillent sur les mêmes fichiers, et éviter les conflits ou bien les gérer?

1 answer

1 accepted

http://githowto.com/resolving_conflicts

Edit: conflicts are good. You do not want to avoid them.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published yesterday in Agile

SIL Simplified - A beginner's guide to Simple Issue Language and how to use it

As a Jira admin, looking for ways to expand your Jira functionality, you may have stumbled across people using and referring to this thing called SIL. Contrary to what some may think, SIL is not the ...

42 views 0 1
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you