GitLive Extension v11 Release: Merge Conflicts Detection in Real Time
Too Long; Didn't Read
GitLive adds gutter indicators to show your teammates’ changes to a file in the gutter of your editor and get notified of conflicts as soon as they occur. These changes update in real-time as you and your teammates are editing. They work in the same way as your own change markers that are a built-in feature of VS Code and JetBrains. You can also cherry-pick your teammate’s change directly from their local version of the file. The indicators can compete with other annotations such as breakpoints.