• 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

0 votes
Accepted answer

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
Community showcase
Posted Friday in Off-topic

Friday Fun: Dry T-Shirt Competition - What's your BEST (Atlassian) T-Shirt!?

[Note: So it was my turn for Friday Fun and sadly I was sick thanks to rubbish sinus infection... so apologies to most of Europe and Asia for the delayed post. However, I finally got out of bed for t...

218 views 17 4
Join discussion

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