Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vscode-merge-base is duplicated sometimes #244957

Open
nZeus opened this issue Mar 28, 2025 · 0 comments
Open

vscode-merge-base is duplicated sometimes #244957

nZeus opened this issue Mar 28, 2025 · 0 comments
Assignees
Labels
bug Issue identified by VS Code Team member as probable bug git GIT issues
Milestone

Comments

@nZeus
Copy link

nZeus commented Mar 28, 2025

Type: Bug

Sometimes the vscode-merge-base setting is added multiple times for the same branch, causing other tools (Nuke) to fail.
I guess there is no check here

await this.setConfig(mergeBaseConfigKey, `${branchFromReflogUpstream.remote}/${branchFromReflogUpstream.name}`);
if the value has already been set

Image

VS Code version: Code 1.98.2 (Universal) (ddc367e, 2025-03-12T13:32:45.399Z)
OS version: Darwin arm64 24.3.0
Modes:

System Info
Item Value
CPUs Apple M2 Max (12 x 2400)
GPU Status 2d_canvas: enabled
canvas_oop_rasterization: enabled_on
direct_rendering_display_compositor: disabled_off_ok
gpu_compositing: enabled
multiple_raster_threads: enabled_on
opengl: enabled_on
rasterization: enabled
raw_draw: disabled_off_ok
skia_graphite: disabled_off
video_decode: enabled
video_encode: enabled
webgl: enabled
webgl2: enabled
webgpu: enabled
webnn: disabled_off
Load (avg) 26, 29, 18
Memory (System) 32.00GB (0.08GB free)
Process Argv /Users/iliatsvetkov/Repos/workflows-2 --crash-reporter-id c0898da9-5733-479d-b3df-367da3b0a819
Screen Reader no
VM 0%
Extensions (82)
Extension Author (truncated) Version
vscode-openapi 42C 4.32.2
Bookmarks ale 13.5.0
toggle-excluded-files amo 2.0.0
markdown-checkbox bie 0.4.0
mermaid-markdown-syntax-highlighting bpr 1.7.0
vscode-markdownlint Dav 0.59.0
vscode-eslint dba 3.0.10
githistory don 0.6.20
xml Dot 2.5.1
overtype DrM 0.5.0
gitlens eam 16.3.3
EditorConfig Edi 0.17.2
elm-ls-vscode elm 2.8.0
vscode-todo-plus fab 4.19.1
dotnet-test-explorer for 0.7.8
html-preview-vscode geo 0.2.5
vscode-github-actions git 0.27.1
vscode-pull-request-github Git 0.106.0
gc-excelviewer Gra 4.2.63
terraform has 2.34.3
vscode-test-explorer hbe 2.22.1
vscode-drawio hed 1.9.0
npm-dependency-links her 1.3.0
rest-client hum 0.25.1
latex-workshop Jam 10.9.0
vscode-edit-csv jan 0.11.3
svg joc 1.5.4
vscode-map-preview jum 0.7.0
favorites kdc 2.4.5
graphql-for-vscode kum 1.15.3
contextualduplicate laf 0.2.0
csharp-colors log 0.2.1
tgit-cmds mbi 1.4.2
vscode-github-actions me- 3.0.1
rainbow-csv mec 3.18.0
git-graph mhu 1.30.0
prettify-json moh 0.0.3
vscode-docker ms- 1.29.4
blazorwasm-companion ms- 1.1.4
csdevkit ms- 1.17.64
csharp ms- 2.70.15
dotnet-interactive-vscode ms- 1.0.6177010
dotnet-maui ms- 1.9.21
vscode-dotnet-runtime ms- 2.3.0
vscodeintellicode-csharp ms- 2.2.3
data-workspace-vscode ms- 0.6.0
mssql ms- 1.29.1
sql-bindings-vscode ms- 0.4.0
debugpy ms- 2025.4.1
isort ms- 2023.10.1
python ms- 2025.2.0
vscode-pylance ms- 2025.3.2
jupyter ms- 2025.2.0
jupyter-keymap ms- 1.1.2
jupyter-renderers ms- 1.1.0
vscode-jupyter-cell-tags ms- 0.1.9
vscode-jupyter-slideshow ms- 0.1.6
remote-containers ms- 0.401.0
remote-wsl ms- 0.88.5
hexeditor ms- 1.11.1
powershell ms- 2025.0.0
test-adapter-converter ms- 0.2.1
vsliveshare ms- 1.0.5948
vscode-paste-image mus 1.0.4
vscode-markdown-plantuml-preview mym 0.0.2
copy-file-name nem 1.2.0
vetur oct 0.37.3
vscode-versionlens pfl 1.16.3
geo-data-viewer Ran 2.6.0
vscode-yaml red 1.17.0
bash-debug rog 0.3.9
zsh-debug rog 0.1.3
markdown-preview-enhanced shd 0.8.18
vscode-taskexplorer spm 2.13.2
lua sum 3.13.9
rest-book tan 6.2.1
pdf tom 1.2.2
luna-paint Tyr 0.16.0
hammerspoon vir 0.5.2
vscode-icons vsc 12.11.0
markdown-all-in-one yzh 3.6.3
markdown-editor zaa 0.1.13

(1 theme extensions excluded)

A/B Experiments
vsliv368cf:30146710
vspor879:30202332
vspor708:30202333
vspor363:30204092
vscod805cf:30301675
binariesv615:30325510
py29gd2263:31024239
c4g48928:30535728
azure-dev_surveyone:30548225
vscrp:30673768
962ge761:30959799
h48ei257:31000450
pythontbext0:30879054
cppperfnew:31000557
dwnewjupytercf:31046870
nativerepl2:31139839
pythonrstrctxt:31112756
nativeloc2:31192216
iacca1:31171482
5fd0e150:31155592
dwcopilot:31170013
6074i472:31201624
dwoutputs:31242946
customenabled:31248079
9064b325:31222308
copilot_t_ci:31222730
850i5325:31264362
e5gg6876:31270012
jda6j935:31233686
pythoneinst12cf:31262606
bgtreat:31268568
fh1c7952:31258891
4gafe986:31264396
31787653:31262186
3e8i5726:31266632
49da9784:31264548

@nZeus nZeus changed the title vscode-merge-base is duplicated vscode-merge-base is duplicated sometimes Mar 28, 2025
@lszomoru lszomoru added git GIT issues bug Issue identified by VS Code Team member as probable bug labels Mar 28, 2025
@lszomoru lszomoru added this to the April 2025 milestone Mar 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Issue identified by VS Code Team member as probable bug git GIT issues
Projects
None yet
Development

No branches or pull requests

2 participants