Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
microsoft
GitHub Repository: microsoft/vscode
 Path: blob/main/extensions/merge-conflict/package.json
3292 views
1
{

2
  "name": "merge-conflict",

3
  "publisher": "vscode",

4
  "displayName": "%displayName%",

5
  "description": "%description%",

6
  "icon": "media/icon.png",

7
  "version": "1.0.0",

8
  "license": "MIT",

9
  "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",

10
  "engines": {

11
    "vscode": "^1.5.0"

12
  },

13
  "categories": [

14
    "Other"

15
  ],

16
  "capabilities": {

17
    "virtualWorkspaces": true,

18
    "untrustedWorkspaces": {

19
      "supported": true

20
    }

21
  },

22
  "activationEvents": [

23
    "onStartupFinished"

24
  ],

25
  "main": "./out/mergeConflictMain",

26
  "browser": "./dist/browser/mergeConflictMain",

27
  "scripts": {

28
    "compile": "gulp compile-extension:merge-conflict",

29
    "watch": "gulp watch-extension:merge-conflict"

30
  },

31
  "contributes": {

32
    "commands": [

33
      {

34
        "category": "%command.category%",

35
        "title": "%command.accept.all-current%",

36
        "original": "Accept All Current",

37
        "command": "merge-conflict.accept.all-current",

38
        "enablement": "!isMergeEditor"

39
      },

40
      {

41
        "category": "%command.category%",

42
        "title": "%command.accept.all-incoming%",

43
        "original": "Accept All Incoming",

44
        "command": "merge-conflict.accept.all-incoming",

45
        "enablement": "!isMergeEditor"

46
      },

47
      {

48
        "category": "%command.category%",

49
        "title": "%command.accept.all-both%",

50
        "original": "Accept All Both",

51
        "command": "merge-conflict.accept.all-both",

52
        "enablement": "!isMergeEditor"

53
      },

54
      {

55
        "category": "%command.category%",

56
        "title": "%command.accept.current%",

57
        "original": "Accept Current",

58
        "command": "merge-conflict.accept.current",

59
        "enablement": "!isMergeEditor"

60
      },

61
      {

62
        "category": "%command.category%",

63
        "title": "%command.accept.incoming%",

64
        "original": "Accept Incoming",

65
        "command": "merge-conflict.accept.incoming",

66
        "enablement": "!isMergeEditor"

67
      },

68
      {

69
        "category": "%command.category%",

70
        "title": "%command.accept.selection%",

71
        "original": "Accept Selection",

72
        "command": "merge-conflict.accept.selection",

73
        "enablement": "!isMergeEditor"

74
      },

75
      {

76
        "category": "%command.category%",

77
        "title": "%command.accept.both%",

78
        "original": "Accept Both",

79
        "command": "merge-conflict.accept.both",

80
        "enablement": "!isMergeEditor"

81
      },

82
      {

83
        "category": "%command.category%",

84
        "title": "%command.next%",

85
        "original": "Next Conflict",

86
        "command": "merge-conflict.next",

87
        "enablement": "!isMergeEditor",

88
        "icon": "$(arrow-down)"

89
      },

90
      {

91
        "category": "%command.category%",

92
        "title": "%command.previous%",

93
        "original": "Previous Conflict",

94
        "command": "merge-conflict.previous",

95
        "enablement": "!isMergeEditor",

96
        "icon": "$(arrow-up)"

97
      },

98
      {

99
        "category": "%command.category%",

100
        "title": "%command.compare%",

101
        "original": "Compare Current Conflict",

102
        "command": "merge-conflict.compare",

103
        "enablement": "!isMergeEditor"

104
      }

105
    ],

106
    "menus": {

107
      "scm/resourceState/context": [

108
        {

109
          "command": "merge-conflict.accept.all-current",

110
          "when": "scmProvider == git && scmResourceGroup == merge",

111
          "group": "1_modification"

112
        },

113
        {

114
          "command": "merge-conflict.accept.all-incoming",

115
          "when": "scmProvider == git && scmResourceGroup == merge",

116
          "group": "1_modification"

117
        }

118
      ],

119
      "editor/title": [

120
        {

121
          "command": "merge-conflict.previous",

122
          "group": "navigation@1",

123
          "when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"

124
        },

125
        {

126
          "command": "merge-conflict.next",

127
          "group": "navigation@2",

128
          "when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0"

129
        }

130
      ]

131
    },

132
    "configuration": {

133
      "title": "%config.title%",

134
      "properties": {

135
        "merge-conflict.codeLens.enabled": {

136
          "type": "boolean",

137
          "description": "%config.codeLensEnabled%",

138
          "default": true

139
        },

140
        "merge-conflict.decorators.enabled": {

141
          "type": "boolean",

142
          "description": "%config.decoratorsEnabled%",

143
          "default": true

144
        },

145
        "merge-conflict.autoNavigateNextConflict.enabled": {

146
          "type": "boolean",

147
          "description": "%config.autoNavigateNextConflictEnabled%",

148
          "default": false

149
        },

150
        "merge-conflict.diffViewPosition": {

151
          "type": "string",

152
          "enum": [

153
            "Current",

154
            "Beside",

155
            "Below"

156
          ],

157
          "description": "%config.diffViewPosition%",

158
          "enumDescriptions": [

159
            "%config.diffViewPosition.current%",

160
            "%config.diffViewPosition.beside%",

161
            "%config.diffViewPosition.below%"

162
          ],

163
          "default": "Current"

164
        }

165
      }

166
    }

167
  },

168
  "dependencies": {

169
    "@vscode/extension-telemetry": "^0.9.8"

170
  },

171
  "devDependencies": {

172
    "@types/node": "22.x"

173
  },

174
  "repository": {

175
    "type": "git",

176
    "url": "https://github.com/microsoft/vscode.git"

177
  }

178
}

179


180