Merge conflicts #39
Merge conflicts #39
Conversation
|
Visit the preview URL for this PR (updated for commit c3f529d): https://gitlive-docs--pr39-merge-conflicts-imz53af9.web.app (expires Mon, 15 Mar 2021 13:08:42 GMT) 🔥 via Firebase Hosting GitHub Action 🌎 |
| ### Gutter indicators for teammate’s changes | ||
| GitLive adds gutter indicators to show you where your teammate’s have made changes to the file you have open, these update in real-time as you and your teammates are editing. | ||
|
|
||
| Insertions are represented by a green arrow, modifications are denoted by a blue line and deletions by a grey line. |
There was a problem hiding this comment.
deletions in red is that right? i thought conflicts are red?
There was a problem hiding this comment.
i think your right maybe crop of the lower part of the screenshot as the bottom red indicator is a conflict. so that they are not confused
| {:class="screenshot"} | ||
|
|
||
| ### Conflict Indicators | ||
| If your teammate’s changes are conflicting with your local changes, they are accompanied by the bright red conflict indicator. These conflicts can be uncommitted local changes you have not pushed yet or existing changes on your branch which are conflicting with their branch and/or uncommitted changes. |
There was a problem hiding this comment.
These conflicts can be uncommitted local changes you have not pushed yet or existing changes on your branch which that conflict with your teammates' changes.
_sections/merge-conflicts-vscode.md
Outdated
|
|
||
| {:class="screenshot"} | ||
|
|
||
|
|
||
| ### Review your teammates’ changes | ||
| Once a line change indicator appears in the gutter, hovering over the affected line launches a popup which shows your teammates changes on the concerned lines, the connected issue they are working on and the code they have added. | ||
| Once a line change indicator appears in the gutter, hovering over the affected line launches a popup which shows your teammates changes on the concerned lines, the connected issue they are working on and the code they have added. You can still access other VS Code functionality that is available while hovering, such as IntelliSense. It will appear at the bottom of the popup. |
There was a problem hiding this comment.
This works very much the same way then Intellisense, the popup will now show the usual parameter information as well as your teammates changes
No description provided.