Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Sign up for free Log in
Atlassian Community Hero Image Collage
  • 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?

Jerome
Jerome Atlassian Team Jan 16, 2014

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?

Answer
Watch
Like Be the first to like this

1 answer

1 accepted

0 votes
Answer accepted
Radu Dumitriu
Radu Dumitriu Jan 16, 2014

http://githowto.com/resolving_conflicts

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

Reply

Suggest an answer

Log in or Sign up to answer
Git
Git
TAGS
Community showcase
Tricia Olson
Tricia Olson
Published in DevOps

Step up your DevOps game webinar Q&A series - Questions answered!

  On October 21st, 2020 we hosted a webinar titled,   Step Up You DevOps Game with 4 Key Integrations for Jira and Bitbucket. We had a great showing and high engagement, but that meant th...

101 views 0 1
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you