GitLive has an early warning system for merge conflicts. It will show you where your teammates have made changes compared to your version of the file. It can even update in real-time as you and your teammates are editing. For simple conflicts this can be a quick way to resolve them as identical changes on different branches will merge cleanly.
3 Comments
Sort: