Use 3-way merge editor to view and edit SVN merge conflicts #2330
Annotations
10 errors and 2 warnings
|
src/commands/openConflict.ts#L19
Replace `!info.conflict·||·!info.conflict.curBaseFile·||·!info.conflict.prevWcFile·||·!info.conflict.prevBaseFile` with `⏎········!info.conflict·||⏎········!info.conflict.curBaseFile·||⏎········!info.conflict.prevWcFile·||⏎········!info.conflict.prevBaseFile⏎······`
|
|
src/commands/openConflict.ts#L30
Replace `·base,·input1,·input2,·output:·result` with `⏎········base,⏎········input1,⏎········input2,⏎········output:·result⏎·····`
|
|
src/common/types.ts#L50
Insert `⏎······`
|
|
src/common/types.ts#L51
Insert `··`
|
|
src/common/types.ts#L52
Insert `··`
|
|
src/common/types.ts#L53
Replace `······` with `········`
|
|
src/common/types.ts#L54
Insert `··`
|
|
src/common/types.ts#L55
Insert `··`
|
|
src/common/types.ts#L56
Replace `····}` with `······}⏎····`
|
|
src/resource.ts#L52
Delete `·`
|
|
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v2, actions/setup-node@v1. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|
|
The following actions uses node12 which is deprecated and will be forced to run on node16: actions/checkout@v2, actions/setup-node@v1. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/
|
This job failed
Loading