3 ms·
I don't have it in front of my right now to go into detail but one thing I find very frustrating is functional. When there is a merge conflict its a 50/50 coin
by kyriakos 4y ago
I don't have it in front of my right now to go into detail but one thing I find very frustrating is functional. When there is a merge conflict its a 50/50 coin toss if the conflict can be displayed in the UI or not.
- smallishlemur 4y agoDo you mean displaying conflicts directly in the diff? At the moment I believe an alert is shown on the file if there's a conflict, and the comparison changes to the source branch and the base of the target branch. Depending on the complexity of the conflict, you are able to resolve via the conflict resolution UI (otherwise you'll have to just resolve it locally).
- kyriakos 4y agoCorrect, conflicts are not shown in the diff just the fact that they exist.