How to avoid when two members of same team updating same file and pushing to Central Repository

Hi Team,

I have one question here.

1. How to avoid when two members of same team updating same file and pushing to Central Repository in Git or Github. How to aviod it?

Thanks,

Maruti. 

1 Like

I got the same question… My friend who works at rsip.com tought he had sovled the problem. But when members updated thier files it locks up??..

There are a bunch of strategies for helping people to not run into conflicts when editing the same files. Using the GitHub Flow is helpful so that people know what you’re working on and communicating in Issues and Pull Requests are very helpful ways of making sure you’re on the same page.

However, there will be times when you run into a merge conflict, so you may want to read about Resolving merge conflicts using GitHub.