Sublime Forum

Blackout on resolve conflict

#1

I had done a cherry-pick, which did not apply cleanly. When I attempted to resolve the conflict, I was instantly met with a black screen and a spinner. There were two files that did not merge cleanly, but only one of them causes this bug; going into resolve conflict mode with the other works as expected, and goes into the three-way merge tool.

When the black screen occurs, there seems to be nothing I can do to get it out of this state. Even closing the window leaves an errant process running in the background, which slowly starts to eat RAM if left alive. I have to kill the process or restart the operating system.

The same thing happens regardless of whether graphics acceleration is enabled or not.

Build 2091

Edition Windows 10 Pro
Version 22H2
Installed on ‎1/‎22/‎2021
OS build 19045.3930
Experience Windows Feature Experience Pack 1000.19053.1000.0

image
image.png2226×1174 61.4 KB

0 Likes
#2

The software is unusable to me with this issue; any help or insight would be greatly appreciated.

0 Likes
#3

Could you provide the debug information from Help > Debug Information?

0 Likes
#4 
=== App Version Information ===

Build: 2091

=== Git Version Information ===

Using Git: C:\Program Files\Sublime Merge\Git\cmd\git.exe (bundled)

git version 2.39.1.windows.1

PATH: [REDACTED]

=== Browse Page Information ===

HEAD: 45a3b557c6f3f35853e3ec17a187f7c24f63ff79

Is in merge: 0

Is in cherry_pick: 0

Is in rebase: 0

Is in revert: 0

=== Git Status Information ===

UU [REDACTED]

UU [REDACTED]

=== Our Status Information ===

U U [REDACTED]

U U [REDACTED]

=== Git Config Information ===

color.diff.new=blue

color.diff.old=red

color.interactive=true

color.status.added=blue

color.status.branch=cyan

color.status.changed=green

color.ui=auto

core.autocrlf=true

core.bare=false

core.editor='C:/Program Files/Sublime Text/sublime_text.exe' -w

core.filemode=false

core.fscache=true

core.ignorecase=true

core.logallrefupdates=true

core.repositoryformatversion=0

core.symlinks=false

credential.helper=manager-core

credential.https://dev.azure.com.usehttppath=true

diff.astextplain.textconv=astextplain

filter.lfs.clean=git-lfs clean -- %f

filter.lfs.process=git-lfs filter-process

filter.lfs.required=true

filter.lfs.smudge=git-lfs smudge -- %f

gpg.program=[REDACTED]

help.format=html

http.sslbackend=openssl

http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt

include.path=C:/Program Files/Git/etc/gitconfig

init.defaultbranch=master

pack.packsizelimit=2g

pull.ff=only

pull.rebase=false

rebase.autosquash=true

safe.directory=[REDACTED]

user.email=[REDACTED]

user.name=[REDACTED]

=== Our Config Information ===

Git Config Path Information

Using config path: /C/ProgramData/Git/config

Using config path: /C/Program Files/Sublime Merge/Git/etc/gitconfig

Using config path: /C/Users/[REDACTED]/.config/git/config

Using config path: /C/Users/[REDACTED]/.gitconfig

Using config path: [REDACTED]

Our config output is identical to the Git config output

=== Git Attributes Information ===

git check_attr --all output

=== Our Modified Files Newline Normalisation and EOL Information ===

=== Our Modified Files Flag Information ===

Ignoring symlinks: 1
0 Likes