Merge Editor File Not Modified on Open: "VS Code no longer modifies the result file when opening it in the merge editor (conflicting regions were replaced with base). Instead, the conflict markers ...
GitHub today announced a major update to its visual Git client, GitHub Desktop. Version 1.5 introduces a new way to resolve merge conflicts, which are inevitable when working on a project with a team.
Some results have been hidden because they may be inaccessible to you
Show inaccessible results