kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00
Code Issues Projects Releases Wiki Activity

fix dependency conflict

Browse Source
This commit is contained in:
kahole 2023-03-01 10:44:43 +01:00
parent ed502d9e32
commit 375b40146d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
# Changelog
## [0.6.38]
## [0.6.37] - 2023-03-01
- Switch from `--preserve-merges` to newer `--rebase-merges` in rebasing options
- Upgrade to newer refs api to fix breakage on coming VSCode versions (Burak @unexge)

6
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "magit",
"version": "0.6.37",
"version": "0.6.38",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "magit",
"version": "0.6.37",
"version": "0.6.38",
"license": "MIT",
"dependencies": {
"@vscode/iconv-lite-umd": "^0.7.0",
@ -18,7 +18,7 @@
"@types/glob": "^7.1.3",
"@types/mocha": "^8.2.0",
"@types/node": "^18.14.2",
"@types/vscode": "^1.75.1",
"@types/vscode": "^1.50.0",
"@types/which": "^2.0.1",
"@typescript-eslint/eslint-plugin": "^5.54.0",
"@typescript-eslint/parser": "^5.54.0",

4
package.json
View File

@ -7,7 +7,7 @@
"author": {
"name": "Kristian Andersen Hole"
},
"version": "0.6.37",
"version": "0.6.38",
"engines": {
"vscode": "^1.50.0"
},
@ -706,7 +706,7 @@
"@types/glob": "^7.1.3",
"@types/mocha": "^8.2.0",
"@types/node": "^18.14.2",
"@types/vscode": "^1.75.1",
"@types/vscode": "^1.50.0",
"@types/which": "^2.0.1",
"@typescript-eslint/eslint-plugin": "^5.54.0",
"@typescript-eslint/parser": "^5.54.0",